Sorry that I took the photo before straightening up the room much. :)

i would switch the vanity with the toilet

That is a great idea! It would be a better use of space.

Is your master on the first or second floor of your home. If on a second floor, switching the toilet is most likely not an option because of the waste line and the requirements related to slope and not cutting floor joists.

Absolutely do a tile shower with a frameless glass enclosure to open things up. you may want to consider a pedestal sink in order to gain space to move around in the room.

If moving your toilet is an option, I would have it switch places with your vanity. This will open your floor plan and make better use of your existing layout.
Install a double threshold shower base (or tile the base) so that you can have two glass walls as part of the enclosure. This will brighten the space. I suggest installing a rainhead and handhsower for your fixtures. This provides additional luxury and wow factor to your shower.
Keep your fixtures chrome and the lines clean and simple. This will help achieve a timeless look to your bathroom. Don't be afraid to introduce colour! Have fun with paint and accent pieces but keep your toilet, sink and shower base white.