If your going to swap for a cam that will be the best fit for your combo.
I would 100% say go with an ed curtis FTI, Jay Allen Camshaft innovation, or Buddy Rawls (sp?) custom camshaft.
If you already have an off the shelf cam and want to get the best cam for what YOU want...another off the shelf cam will not be the best choice.