I think many share your concern. Here is a link to a recent post that got a lot of input on the subject:
I think heaven and hell are perhaps over-emphasized when we look at the gospel. Our youth pastor preached this last Sunday (yep, the senior pastor was out of town, so he got the call…) and did a great job. He said something to the effect that the gospel according to Jesus is washing people’s feet, and if that displeases you, you are going to be pretty unhappy with heaven. Food for thought.