i still stick by the 0/21/20.
http://www.torhead.com/skill-calc#201ZcszrbMr0zZcrcRsMz.2
i keep under 5 deaths and average around 280k dmg a map depending on how i use my aoe's. the instant whirlwind is a must have and with the the early break stun and reduced CD i almost always have it when i need it. you're build isn't bad though.