What is your gear setup: strength or power augments and do you stack power/surge in mods/enhancements or do you get some critical in there as well?
The goal is to work with what you have. Augments for sure Str. Str is always going to be better than power because of the added bonus above and beyond just bonus damage.
The goal is to have 30% crit and Surge 75% without sacrificing main stat or power. This all comes with the gear from WH. Optimizing will only help a little in order to get your main stat higher with sacrificing some crit or minor amount of power through mod changes. Also if you can afford the ranked comms, pulling the armoring out of the off-hand to make a modded belt and bracers is good.