M.M.
If it's really hard to decide I would definitely wait until you get to see him.. one of the names will just be the right one.. Or maybe a completely different name will be right.. Wait, even if it means his name will not be up on the wall when he gets home.. It will get there eventually.. Getting his name right is more important..