I think your first idea can work. Just flip the bathtub to have the faucet under the window, and put a second glass divider between the bathtub and the shower area. The shower should be curbless. If possible, I'd also twist the toilet 90* so it faces the wall with the door, and then put in a wider vanity.
The second idea might work too but I'd make sure I'm happy with the clearance by the tub (at least have it to code). Again, I'd twist the toilet 90*, and put the sink between the tub and the toilet. And have the door open the other way.
Q