At the moment (important!) I think if you are refering to Yamato as "he" you should also do him the honor to refer to him as "Oden" (or Oden the 2nd or whatever). Because that is the important angle for him at the moment, not the gender.
One thing that is also relevant in my eyes is that we, as...