I forgot to mention that swapping cams right away voids the warranty, good point. For stock replacement, what you did is spot on. The OP mentioned more horsepower, that is why I mentioned the cam swap.
On another note, if you don't mind setting up an electric fuel pump, the L31-R...