This all looks pretty similar to how I have things, except the titles in the season folder names which I did have but took out when I did the dance.
The only other thing I did that comes to mind is that I first switched the whole library back over to the old Plex Series Scanner with TVDB agent and then “upgraded” it back to the Plex TV Series scanner when prompted. You could try that, but doing may result in some screwed up stuff you then have to correct. I had to fix about a half dozen entries.