I think it needs
Thomas as a foundation. I know someone who called her son
Tommy. Her boyfriend was
Tommy and he insisted the child be called after him - literally. So he was Little
Tommy and not
Thomas. It bugged me a bit tbh but then I prefer nns to be backed up by the full name usually.