As a result I installed the "Control Panel for Youtube" chrome plugin and Im able to fix it back to 6 videos per row. I also found I could make shorts play in the traditional youtube player by default - which is an added relief.
I'm also starting to think that no large company will ever act in the best interest of their customers unless required to do so by regulation. As long as those customers are individuals.
Maybe the regulation we need is that companies like Google can't have "ad supported" products that are simultaneously sold as products to users. Either you're selling a product to users, or really running an advertising platform. It can't be both.