Well, you definitely need a new weapon. Whether you dual wield, use a 2-hander, or use sword/shield is up to you (probably one of the first two, since that helps more with the damage) but no matter what, you can definitely increase your dps. After that, I'd look at replacing your rings and amulets, since you can now get lvl 63 mods on them. After that, maybe look at getting a vile ward.
As for builds go, I think you should be able to handle a WW build. Depending on how well you can get fury from just WW, you might want to switch to hurricane.