I think you're in danger of blowing the FL residency. NY nontaxability of military wages if you file as part year NY resident.
Going down your path he will be a NY resident for 2021.
