As the supreme One who created all of us out of gentle love,
there is no question that He desires us to be in heaven
with Him when the time comes. Whether this
happens or not is actually up to us.
In other words, how we choose to live our lives determine
whether we want to accept His invitation. We can express our
desire to want heaven by showing His love to others, or we can
turn away from Him by offending and damaging others. So obviously,
this applies to both Christians and non-Christians.
He will never 'force' us to enter heaven. It's our
free will, really.
I don't know for sure (actually no one on earth knows who's in
heaven or hell), but one thing I do know is that the
Christian Apostles' Creed (written at around 300AD)
mentions that Jesus 'descended to the dead' after his death
and before his resurrection, which is traditionally
believed that He did this to bring those who died before Him
to heaven.
You have only said that Christians will go to heaven, you have
not answered if non-Christians by own choice will be spared
hell.
You have also raised a sub-question: what if the choice not up
to me (eg I die at 5 years old in a non-Christian country)?