GrayJay is pretty good option, it does have YT but also has plug-ins for other services. So it could be good for getting results if searching for something that will show up in YT that the creator also uploaded to other sites, while still having the option to watch if not. Also has built-in support for SponsorBlock and DeArrow for the things that are only on YT (and can opt to sign into or stay signed out of YT account). PeerTube is still a mess though. Not able (or at least I don't know how) to pick your instance to sign into and doesn't seem to allow for adding to the pool of peers to help upload while watching. But I don't think even the phone apps that specifically are for PT do that/have the option. Would be nice to be able to do that if on WiFi at least.