disable the BBV properly and you wont have to buy a new solenoid for no reason (torque managment changes are the key here).