I would move the wall entering the restroom into the bedroom 2' which would allow you to add built in storage next to your sink. You could replace the shower with the rectangle shape rather then a corner unit. This would run alone the left wall. Use a pocket door to save room inside the restroom. By keeping your plumbing in the same location the cost will be keep low. You could make it a tub shower combo. Good Luck