I've run into this as well (the DPS thing) and I notice that different DPS meters will register different DPS. With about 1600+dmg on my guys, normal instance runs net them about 1k DPS but with wrath hitting for 3k every 1.3 seconds (critting for 5k+) and both insect swarm and moonfire ticking in the background, I know that's pure bullshit. I've pretty much stopped watching the DPS meters as it is a non-productive exercise.

Most of the time, though, it's less an issue of gear and more an issue of making your DPS macros "automatic," which you seem to have gotten done pretty well. Also, not being in moonkin form means you're sacrificing a notable amount of DPS to maintain heals, ESPECIALLY with the recent change to convert 30% of spirit into spellpower while in moonkin form. I chose the 1 tree, 3 moonkin option. Haven't bothered with heroics yet as I'm still learning the normal dungeons and finishing up basic gearing and faction stuff/achievements, but the tree druid's wild growth AoE heal usually does an excellent job of keeping my alts alive. It's an option, anyway.

Final thought: druids != shamans. Can't play 'em the same way. ;P