Hi all, we are looking to redo bath and I wanted to see if anyone could lend us some fresh eyes.

Current bathroom issues (looks like a DIY project from previous owners):

• Open shower with terrible absorbant natural stone tile. We want an enclosed glass shower. We expect to need to do a full gut for potential water damage.
• Lack of storage - mostly for wife's curling iron, hair dryer, makeup, etc. Our vanity drawers are tiny so storage feels like a big downgrade from our old bigger apartment bathroom.

Options / ideas (looking for help!)

1. Keep same layout but add a medicine cabinet(s) on the side or front. Get a slightly deeper vanity.
2. Turn the back bench part of the shower into a sort of cabinet / closet. The shower is currently 6' deep. The doors would only be accessible when the bathroom door is closed though.
3. Totally new floorplan - what would be better than the current layout?

I appreciate any comments!