I am not sure about tourist traps in post-tsunami Phuket, but Patong itself was pretty built up last year. Kata was very nice, a lot smaller and more personal.
You can also contact DTW via e-mail and they'll do all the arrangements prior to your arrival, so you don't have to waste a day in Patong trying to get everything done. They are pretty organized over there. Just tell them when you'll be there and what you'd like to see and they'll set it up for you!
I highly recommend Marina Divers in Khao Lak for the Similan / Koh Tachai / Richelieu rock region, and Calypso Divers for the King Cruiser / Koh Doc Mai / Shark point dives. IQ Divers was OK, but they are not the most personable operation we encountered on our trip!
Let us know how your trip goes when you come back!
J.