Changing Cams

I would do the converter first and try some tuning.

OP, what converter are you running now? That, in of itself, could make a huge difference.