Diving on or near Tahiti

My boyfriend and I are planning to visit Tahiti for 4 days in Jan on a stopover from South America to NZ. We are on a fairly tight budget, but I would like to dive while we are there. We don't really want to have to buy a guidebook for just 4 days, so I am looking for some info on where we should spend our short time. I have heard that the island of Tahiti itself isn't the most beautiful of the islands - perhaps we would be better heading to another island by boat?
We are looking for recommendations for reasonably priced accomodation, a nice place to hang out for a few days, and some good, accessible dive sites. Any advice would be welcome. We have a tent and are happy to camp, but I get the impression that there aren't many opportunities for this in Tahiti?

Thanks!

Most people will tell you to take the ferry to Moorea. But the diving is good to great on all the islands, including Tahiti. There is some camping available on Tahiti-iti, the little smaller bit of the island sticking out to the southeast. I know Pension Au Bonjouir has some tent spaces, I've seen 'em used. The reef and lagoon right off the back dock is awesome.

Ed