If I were you, I wouldn't spend the money to cam a na motor. There is not much for gains. These motors make power with boost. Most other mods don't do much in the grand scheme of things.

If you think you will top swap it, I would save up for some heads and stick in an xpz at the same time. IMO, the xpz is a better dd cam than the xp.