Coldfish,
You may wish to review my thread on my baptism. Jaffecake wrote a most excellent reply regarding baptism, in the Watchtower Organizations own words.
I say do what you feel is most important. It that is to be dunked again, to re-dedicate your life to your new understanding, no problem.
I dedicated and was baptized into the Father, the Son, and the Holy Spirit. The Father's name happened to be Jehovah. I have since realized that this is only a nom de plume. I dedicated my life as a Christian to the understanding I was given at the time by jehovah's Witnesses. I never felt a connection to the Divine until after I left. I feel that the WTBTS improperly stiffled that connection and condemned anyone who felt/developed the connection. I none-the-less, dedicated myself as a Christian. Period.
Today, I'm beginning to understand just what that means. Thanks to JWD, I have broken down my belief structures and have begun to rebuild them; keeping what is valid to me, and discarding beliefs that are no longer necessary. This is something the WTBTS heavily discouraged and disfellowshipped for! But in the True Christian Congregation, this is encouraged so we can fully know and understand.
I'm glad I started that thread. It got some people thinking, as I had been thinking and examining when I posted it.
Blessings on your path
Brenda