Sounds like your not using the plex naming scheme as documented but your aware of it and specifically can’t.
Plex being very picky and a bit inflexible in the naming area leaves you a bit up the creek. If you cant reorganize the media then as you mentioned trying to move the folder itself is the only natural option but suboptimal. Root level library items like movies can be split but inside them like show episodes or extras I am not aware of granular controls like that.
The other potential option is to keep that data out of the library entirely and use symlinks or hardlinks to point plex to it where you can lay out the new name scheme without renaming or restructuring the original data.
If you see the post by chuck on my my post regarding symlinks its not a suggested or necessarily supported method, but using hard links should cause the least Plex issues. Especially if you run some sort of root folder for non-compliant media to live plex can access but is not part of the actual plex scanned library folder.
