On that same haste % note, I've noticed under heroism my wrath seems to bottom out the GCD an make nature's grace procs 100% useless as I end up waiting on GCD anyway.

I would say if your not going to use the eclipse talent I would glyph for starfire and moonfire and just spam starfire while keeping insect swarm and moonfire up on long fights and on short fights just put up insect swarm and spam wrath, maybe moonfire occasionally.