I like Matti myself. But I think it's good that you have the option of Matt too. Even if you think it's too common, it can be good to have a regular back-up name. It's probably the best option for when he's a teenager too.You could also use Matas or Mats.