W
WetSaw
Sink where the toilet is in the layout above. Toilet in the original position and a walk in shower where the bath is above. I'd also leave the small window in. However, unless it's a "starter home" I'd always have a bath in the house because even though I never have one it can affect the saleability when the time comes.