Just get the bigger map sensor and a chip to run it with that map sensor until you can get it mapped, I run 21psi on a stock 1272cc bottom end with no issues, I'd speak to PPP about mapping and a bigger map sensor/chip, you can always turn the boost down if you don't want to run 18-21psi, I was going to do the same, but the car is too much fun to turn it down now....