Well, it's your call. If you get a 1.1 Gbps speed then you're capped by the single gigabit port as you state. That narrows the difference against the 600 (typically 630) speed tier. Your choice then depends on the pricing of the real world 630 versus the real world 940, and how desperately you need that speed. A Hub 5 would sort out the gigabit port issue, but they're not on general release yet and no way of requesting one.
In terms of 2.2 Gig speeds, they're already on field trial in several cities, but VM only launch a new speed when they think enough people will pay more for it. There's no sign of a commercial launch yet, and seems to me unlikely they'd do it as we go into the summer holidays, and then I'd expect a soft launch in a few cities first, and then make it go live in other regions progressively, but this is also probably contingent on the Hub 5 working for those higher speeds. I'd guess the marketing people are pushing for availability in Q3 or 4 of this year, the commercial people are probably worried that not enough people will pay a premium over 1 Gbps, and angling to hold back whilst overall market expectations of speed increase. So a complete guess, but I'm thinking general availability of 2.2 Gbps is probably Q2 2023 at the earliest. You should also consider that whenever VM launch a new service or product, there's teething troubles - if you were an early adopter of 2.2 Gbps, then you'd be a guinea pig and should expect some anomalies, and any expectation of blissfully uninterrupted cat videos at 2.2 Gbps download are probably unrealistic - these speeds really are pushing a real world implementation of DOCSIS to the absolute limit and possibly beyond.
One rhetorical question: In your quest for speed, how much time do you really spend watching progress bars?