Exactly this. I don't want my source of hardware to dry up, but I'd love if ISPs wouldn't allow the stock firmware to connect to their networks.

I bought a pair of TP-Link units specifically because OpenWRT ran well on them. If I had to get something more expensive, I might not decide to keep a cold spare.