@teabuscuit
Hello. Just a warning about JW's: baptism within their org is not the same as baptism in other so-called Christian religions. JW's baptism is a binding contract into their org and a publicly made agreement that you accept THEIR rules and standards for life even if those rules and standards conflict with your conscience (and many of these have no solid biblical foundation).
It is obvious that you have already made your personal dedication to God. That is a private matter, and that is what counts. Even the JWs teach that baptism is the public display of what has already been done in private, although they likely won't admit that their baptism binds you to their organizational rules and those rules are subject to change.
On the topic of transgenders, I recommend you check out the YouTube account for JW T girl. This is the account of a lady who was JW and went through the full transgender process. She tells her story and documents it in detail. You may get some insight on this topic from her account. Good luck.