I agree with your statement completely. Whether one believes or not is moot, because EVERYONE dies we will all learn the truth of it. Let's assume the Christian viewpoint is correct, just for arguments sake. You have a good man who is an atheist, but gives to his community and is extremely charitable, humble, honest and honorable in every way. In the same town you have a 'Holy' man, who preaches love, charity, kindness and believes wholly in Jesus as his savior, but this man is corrupt, bigoted, commits sins, and does not truly love his neighbors, but uses them for money. Which of these two men will go to heaven?
Matthew 9: 12-13 is often interpreted incorrectly. Jesus said he came for the 'spiritually sick' as he spoke to 'righteous' men of his day. Often this passage is used to say that 'good' people cannot go to heaven just for being good. I disagree. I think he wasn't pointing out the 'good' who lack faith, but the self-righteous, who are clean on the outside but foul inside.