Hello! I'm looking for layout advice on a small bathroom.

Details

• 2 bedroom, 1 bath apartment used by roommates.
• There is a room that currently contains the toilet.
• There is another adjacent room that currently contains the shower and sink.
• I'm less interested in combining the two rooms as it can be nice to have them separate for roommates.
• I'll likely add a small hand-washing sink to the toilet room.
• I'm mainly looking for suggestions on how to layout the shower room.
• 108" ceiling.
• I'm planning on just adding a shower (no bathtub).

Current Thoughts

Option A

• Neo-angle shower (38" base, 36" enclosure)
• 24" vanity
• Pros: More space to maneuver in the bathroom, additional storage space by shower, less crowded
• Cons: Smaller shower

Option B

• Once we remove the plaster from the walls, there will likely be enough space to add a 30"x60" shower pan.
• 36" or 30" vanity
• Pros: Larger shower, larger vanity
• Cons: Bathroom could feel cramped, might be hard to close the door

What do you think? Any other options you would suggest?

Thanks!

Nick