Mostly agree, though remember that there's plenty of ODMs out there who will happily put a AOSP fork on top of hardware designs they have if you want it.
Doesn't have to be the big manufacturers. The current ODMs are starving in a more and more decreasing margin for them on HW.