You might also want to look at ROI in terms of BTC instead of $, especially if you are a hodler. If you assume difficulty will increase, then the ROI will take longer in BTC.
As basic as this sounds, many people don't understand it, generally speaking, mining beats hodling only during sideways / accumulation phases, where the value of
BTC against fiat isn't going anywhere for an extended period of time and holding
BTC doesn't make you more BTC nor more fiat, that will be a paradise for mining.
The other two phases of the market are either an extended bull like that one we are in or an extended bear, you have perfectly explained the bull scenario and I think it's pretty clear to everyone, the bear scenario will heavily depend on your own ways of dealing with the market if you are a perma-bull who plans to hodl for "eternity" then buying gears is the better option, if you prefer to stay as liquid as possible to potentially exit while the exit gates are still empty, then you would want to hodl
BTC rather than a mining gear, I mean it takes a second to sell your
BTC but takes a lot longer to sell your mining gears.
Another major factor that many seem to ignore is that mining gears have a limited timespan, it either becomes unprofitable to mine or slowly fails and dies, while hodling
BTC costs almost nothing and it has no lifespan to it (well, unless you mess up with the security measures and you lose it) but well, your mining gears can catch fire.
Now back to the specific case of OP, your power rates is far from competitive, during this mania (which I believe will end soon) you could make a profit with almost every gear you buy, but once it's over you will be competing against the average 4-5 cents and the 1-2 cents during the hydro season in China (which lasts for about half of the year), so if you are not in the 30w/t range you will be forced to shut-down your miners, I would not buy mining gears at such prices, but if you decide to do so anyway, try to stick to the most efficient gears so that you can at least ROI on the fiat value you are going to pay.
As for where to buy from, I have just answered a similar question
here, feel free to check it out.