Yep, I'd go the full name and call him Olly. That's was the plan with our DD (although she's very rarely called the short version!) and we have the same plan if this bub is a girl.