If it's possible to do so, you could get rid of the sink that is to the right of the doorway (on the curve), move the doorway to the right and make the shower area larger by expanding it to the area where the doorway is now......OR.......move the doorway to the right still, make a shower where the garden tub is now, and put a 2nd vanity in the old shower space expanding it to the area where the doorway is now. If you're moving in a year, you might want to keep the garden tub because then you won't be excluding any buyers and you'll still be getting a larger shower. Whichever gives you the most bang for your buck.

Here's my two cents - as a realtor and a homeowner- based on the layout drawing: I think the two sinks are not a good idea. A key reason for two sinks is for two people to be able to get ready at the same time but this layout prohibits two people using sinks at the same time. I'm worried buyers will get too wrapped up in the awkwardness of it. The obvious thing would be put two sinks on the long vanity, even if they are close together. Also, I've seen people hang oval mirrors over a window both for practicality and privacy. I second the idea of glass walls - it opens the space and makes it look more modern. Hope this helps.

You are correct that you'll need 3-wire cable to wire the circuit as you describe. You left out the part that you'll need 2-wire cable from the second switch to the second light fixture. I'm assuming that the two switches are in the same box. If not, you'll need 2-wire cable to go between the switches as well.

FWIW, those were not expensive fixtures. I've seen them in either Lowes or HD, although it was a while ago and they aren't on the websites anymore. If you take the picture in and are fortunate enough to find someone in their lighting depts who wasn't working in paint or garden the day before, they might know who made them. Incidentally, the store displays were slightly off kilter, too, just like the ones in your pics.