Theodore. Matthew is far too outdated for me, too many boys in my school year and surrounding years with that name. Mulitple Matts and Mattys from the generation now having children.
Much prefer potential nicknames for Theodore too.
Another point to take into account, however - if this is important to you - Matthew is less common nowadays whereas Theodore and all variations (Theo, Teddy, Ted) are extremely popular atm.