Answer:
The Baptism is a separate experience from Salvation, and no, you do not need to be Baptized in the Holy Spirit to be saved and go to Heaven.
All of Jesus disciples who were waiting in the Upper Room were already saved, they were to wait for “power” to go out and witness…it was about them being able to win others for Christ and live empowered lives, not to get them to Heaven.
I do believe that for any Believer the Baptism is something you should absolutely seek as it was NT experience for Believers to also receive, but to teach you can’t go to Heaven without this would be wrong.