I'm same with you. I'm militant in letting YouTube know what I don't like (on top of a lot of other adblocking and tracking blocking. But I'm sure my threat profile is still too loose for some) so my Shorts are almost always what I didn't know I want. I also use modded YouTube app and used a Firefox add-on to automatically force change the URL from Shorts format to normal YouTube video format. So I don't get the infinite scroll.