Baby boy name...help!

Im 13 weeks pregnant, so obviously we dont know whether we're having a boy or girl yet. We've had the same girl name picked out for 2.5 years now (since we found out about baby #1, which happened to be a boy) we had the same problem then too. We CANNOT agree on a boy name. We didnt have our sons name picked until 2 weeks before he was born. And he only ended up with it because it was the one and only name we both could live with. His family is primarily hispanic, mine couldn't get any whiter. (Our kids are the first mixed babies in my entire family on both sides)

So far we've agreed (kind of) on Johnny for baby #2. my boyfriends grandpa raised him and his name is Juan, but everyone calls him John or Johnny. Absolutely fine by me...but I dont want his name to just be Johnny, and I dont like Jonathan either. So I either need an awesome middle name that suites Johnny or a different first name that Johnny can still be used as a nickname....and some baby girl dust sprinkled this way because Im already losing hope for a decent boy name =/