I really like
Jonah and also
Jonas for a boy, both are strong and masculine yet are also cute! I wouldn't use the nn
Joe for either I'd just call him
Jonah. But if you must has a nn what about
Jon or
Jonny?
I also like
Josiah and
Josias. :)
http://kevan.org/johari?name=LadyBug19