Obviously we can’t know for sure long term, but he’s completely locked in for Paris.
My understanding is that the change of sporting citizenship rules have gotten tougher for swimming since Condorelli and Sanchez made the switch, so this is likely long term.
Him getting US citizenship is also just not something I would read anything into, he’s lives there (well, here since I also live in the US xD ) most of his life and, ironically, acquiring US citizenship actually makes it easier for him to leave the US long term if he wants to train in Canada after college (it’s very easy to lose a Green Card while citizenship is very much permanent). Personally, being able to move back and forth between Canada and the US was one of my big motivations for getting naturalized as an American citizen.