My watching section looks like a clusterfuck right now and it would be handy if there was a feature like the one on the home page
I had a similar problem. I decided to make custom lists for both categories and check mark the label for each show. Of course, you'll still have your "watching" category on the list, but you can then move that to the bottom. Attached is an example of how I organized my list to be a bit more "readable".

I also did something similar with my "planned" shows but you don't necessarily have to do that.
Cheers :)