There's more room than he needs in the hall bath right now. Take that space and add it to the master bath (sliding the wall plan south to leave 5-6' feet in the hall bath). Shower will get slightly smaller but the space will open up enough to get the door out of the corner and do split vanities around the window with a makeup counter between.
Might also need to slide the door in the hall bath to clear the vanity but what's re-framing another door when you're tearing up 2 bathrooms already? And it should really swing open against the tub from a usability standpoint anyway.
- 
- 
Your Privacy Choices