X2 as long as you get a base kit and are not changing things that the box tune is tuned for, you should be fine. Although it's a good idea to buy a wideband guage and a guage to scan for knock.
A basic bolt on Z3 kit would put you in the low 13's, given a decent driver.