Which is by current official workshop labor charges isn't going to be really worth it. I'd say doing tuning work on it with piggybacks is a better option together with changing driving practices.

And the CPS head, well for now unless someone churns out more aggressive cam lobes profiles for high cam mode, it's gonna be hard to justify going for CPS.

That's why laaa. I'd say proper lateral thinking and tuning would fix some of the S4PH ori's flaws. One would be airflow characteristics since IMHO, that airbox system seems a wee bit pressure robbing (Can anyone verify this using a manometer measuring the beginning of the intake piping and at the inlet of TB?) as well as fuel mapping tuning
Isn't easy as that because therein lies a few questions:

1.) How much is the whole system gonna cost parts wise? (Manifold, ECU [hopefully one can use the original wiring loom and hook up a few extra external wiring], and necessary brackets)

2.) Will the job be covered under P1's warranty scheme? (If still under warranty la)

3.) How much labor time required?

4.) Will Service Dept. even sell you the parts?