After seeing a post on the HN front page, I've replaced YouTube entirely with NewPipe, and it is a huge improvement.

I still subscribe to channels that I like and respect, but not being subject to the toxic injection of YouTube shorts or recommendations drastically cuts down on my dwell time in that app.