BTW, this is just hypothetical. I was baptized as a JW. In my heart I devoted myself to a GOD and a religion on that day in 1977. The dedication to GOD still holds.
Just wanted to say, I'm of the same opinion too. Many JWs are in this same difficult "situation" you describe, a true quandary of sorts. But, basically, I think most people, most JWs will agree that there was nothing wrong with the "questions" posed originally to baptismal candidates before the critical revision was made in 1985.
But after 1985,...now that's a horse of a different color all together...at least according to most JWs I've talked to. Most agree if they got baptized after 1985 and became a "victim" to the recent questions, that after leaving JWs, this "change" left a bad taste in their mouth, that's if they got baptized after this change. Many want to get "re-baptized" I've found. They feel the change in the questions and the way this was all handled, clandestinely so, shows them the real way the organization "controlled" them. The deceit. Some feel they were "tricked" by the organization, into dedicating their lives "to an organization" instead of to God, thru Jesus, and in the name of the Holy Spirit.
But, I think overall, even after a person leaves the organization, he can still maintain his dedication to God. Thus, being in or out of the organization, would then have nothing to do with his dedication to God, symbolized by water immersion. The sincere disciple knows he did not dedicate his life, to an organization, as exemplified by the original baptismal questions asked. So most JWs feel the questions were okay, the questions the Watchtower decided to ask before the change in 1985 and can live with the "dedication" they made and the words they "agreed to."
But not so with those who leave the organization, and were baptized AFTER 1985...their situation is seems to be, even more "complex," actually.
This is what I have observed.