Staying hydrated helps a lot too.
As for the Dysphoria, I found it helped to get into the mindset that I was always a girl, just a really, really Butch looking one, but was really Femme underneath. Sort of like transitioning from Male to Femme, not just Female.
Glad to hear your partner is learning to appreciate how great it is to live outside the square.