This is just too much. She needs to think. Why isn't this working? Is she out of wishes? Ok she needs to test that. What's a simple wish?
"I wish uh...I was a boy?"
Sam finds himself wondering why that was what came out. He is now wearing a suit, but looks no less geeky than his female counterpart. Ok so not out of wishes. Well time to get her feminity back.
"I wish I was a girl."
Nothing. Great now he's really screwed up. But is that the answer? He can make new wishes, but not undo the old ones? Ok not good but he can work with that. He just needs a wish that will keep him from diapers then he can try to find a loophole to fix himself.