I say the head you have now will work just fine .When you get your bearing and thrust washers.Put it on and check the squish and see if its right or not.
From what I got from reading Jerry's post the water mod will work just fine on your quad. Or get a cool head and send it to Jerry or Carl for some TLC.