IMO, stick with the roller cam set up, get a new roller cam and spring package, you'll be way ahead of the power game this way. Good advice below if your not to up on cam's.
:D I've already been looking at different companies and what they have to offer for the roller setup. I already have springs laying around when I do change cams.