Go NAUI. It's the original. PADI is a little more agressive on thier dive charts where NAUI is more conservative. I would rather error to the conservative side. Really it dosen't matter they are both great outfits. I see you're from Tampa. Scuba Quest has some good instructors. I took a re-cert class at the one in Brandon on hwy 60. They also have one on N. Dale Mabry in the carrolwood area.
I would buy everything but the tank. It's nice dive with familiar eqiupment. When you're done with your cert sign up for DAN Divers Alert Network. You'll learn more about them during class.
Have fun and enjoy.
