Nursery Dilemma

One of the first questions I get after announcing I'm pregnant is if we've chosen a room for the nursery. For the most part the answer is no. The way our house is built, we have two real options, yet I go back and forth on which one would be most ideal.

First we have the room straight across from our bedroom...It only has one exterior wall, and a pretty nice closet:
The second room is in the corner of the house, and the closet doesn't have the lower shelf - which could be better depending on how you organize your closet...
Both are currently filled with random stuff that hasn't found a home yet...and I think they will both need to be repainted eventually, so that's pretty even.

The one thing that I think might be swaying my opinion is the location of the light switch in room #2.
It is around a corner, and I'm wondering if it will be more challenging to use when I'm carrying a screaming infant at two in the morning...

The current plan is to have the other bedroom turned into a guest bedroom for when Melissa comes over...so now she has to come over...she has her own room...