OBD2 swap will give you better tuning options. Headers are always a plus, but may be difficult to fit in the engine bay of the Cavi. No point porting the SC when you can go to the Gen V for close to the same price now. I say pull the engine, cam it, replace your clutch with whatever, slap a Gen V and headers on it, and get it tuned.