There is also Saul and the Witch of Endor. If I remember correctly nothing is said of whether Samuel had been in Heaven. The interesting thing is to notice the absolute terror of the necromancer/witch. Being a fraud she had no expectation that Samuel would appear.
It seemed to fit in with the general discussion.
Even if that was the real Samuel that appeared to Saul, he would not have been in Heaven before that, as he died before Christ. The righteous who died before Christ did not go to heaven, but to paradise, or “Abraham’s bosom”.