I generally like the first one, especially since you get a double vanity, but your shower looks like a bummer. What about moving the toilet so you can enlarge the shower? You could keep everything the same and have a long shower that's 30" wide, or if you want more width, steal a corner from the closet.

(Whether you add a linen closet is sort of independent -- you could make your vanity wider in the first arrangement, if desired, or whatever, so I just threw it in there.) The notch actually doesn't steal as much from your closet as you might think, since corners are badly used with hanging stuff, and I only stole a foot, so you can still fit hangers in front of it, or use a swinging door (inswing to left) and put shelves on that wall.