I would just swap the 2.0 16v in or a ABA motor. You could use the 16v pistons in your 8v motor, but they are not required if you are only boring out the motor, if you plan on swaping the 8v head for a 16v head, you will need the 16v pistons. You could use ABA pistons (2.0 8v) also if just boring.