Defected

Ok Since I cant get rid of Barrage should I get rid of Energy Punch for Whirling hands or Taunt for Whirling hands. I just feel lame without an AOE.

I got a question. Im now level 35 and I have barrage but not Whirling Hands. Next attack I get is Total Focus and I really want it but I also like Whirling hands. Should I swap Barrage with Whirling hands with respec? If so reasons would be appreciated.