My understanding is that if you're fluid, you should expect to bounce back and forth between the genders over time. Permanent changes (or things that take months to reverse) probably aren't the way to go, at least until your sense of gender stays on one side or the other for an extended period of time. If that happens, you can re-evaluate.
In the meantime, keep seeing your therapist. SOMETHING is clearly still up.
Maybe I'm reading into this too much, but it sounds like you don't like the idea of being "just" a guy with a fetish/gender-related fantasies or someone who is only a little genderfluid. If it turns out one of those descriptions is what best suits you, the "optimal" life adjustment for you is going to look very different than it will for someone who is highly genderfluid or transgender.