Here's my take....Non Christians that are good people that have never heard about Jesus will have a type of heaven but They will NOT have JESUS or the SAINTS with them.
TRUE HEAVEN will have Jesus, God, the Holy Spirit, and the Saints....imho.....UNLESS they have REFUSED to hear about Jesus, then it's a whole other ball game....imho.