Blance Druid macros

I'm using ISBoxer and a 2-step macro for my druid, but in most cases the dps is horrible. I have an idea about what the problem is:

Because the main castsequence has resets (can't remember excatly which, maybe combat/10 or something like that) eclipse is very badly handled. That is - only on bosses will I get to the Starfire part of the sequence. Also, as the castsequence keeps dots up, the dps on trash is horrible.

Solutions?

1) Remove all resets on the sequence. This should result in much better use of eclipse.
2) Have another macro for trash with only Wrath, and then have the boss macro start with Starfire. (this should also help with the trash dps due to no dots)

What do you guys do?

I handle my eclipse procs manually. When Jamba broadcasts that my druid has a proc, I switch from doing nature to arcane damage and vice versa.

I have been toying with the idea of mutiple keys in my two step, so instead of doing proc and dps, I send 1 and 2 on key down, then 3 on release. On 1 I have my proc macro, on 2 I have a macro like this:
/cassequence reset=target/combat Moonfire,Nature swarm, null

So what I am hoping is that if I am on the same target I will only fire moonfire and nature swarm once. Granted this leaves the problem of bosses which do not die fast enough, but I am working on maybe having a boss set of macros.

In general I'm starting to use this approach more and more on other classes. Got the idea from Mosq2(sp?) DK manifesto and the priority system.