The F22 is also quite a bit heavier and so make sure you at least upgrade your brakes (EX steering knuckles with the EX brakes would be good).
For your car, I'd still go with the D16A6. If you want to stay with the D15B1, the A6's cam will work great, but there is also a restrictor plate...