Mostly I agree, with your statement, in concern of your point with John 20,22.
It is questionable that all 120 which were in the upperoom was present to receive the Holy Spirit as John 20,22 is reportet.
And John 20,24 says clear that Thomas was not among them. So he missed this expierience...