If you REALLY want to do this, I would suggest you get a piece of bristol board and lay out a template for one cylinder. Mark out the diameter of the combustion chamber and while you're at it also mark out the diameter of the cylinder bore. Layout the inner diameter and outer straight edge of the water passages. I wouldn't get too concerned about the finished ends of the passages because you will blend in the ends of the existing passages when you go to grind. Finish the template by cutting out the combustion chamber and the water passages as laid out
You'll need some layout dye. Put the layout dye on the cylinder head around the existing passages and let it dry. Place the template on the head locating it in reference to the combustion chamber and scribe out the material to be removed as per your template.
Double cut carbide burrs are a little more easy to do this work with than single cut from my experience but single cut burrs will do the work if that's all you have.
After you reworked the head you could then cut out the diameter of the cylinder bore that you previously marked on the template and then check and /or rework the passages in the block.
anyway, that's the way I would tackle it IF I chose to do this mod. It's not a bad idea but I'm not sure if it's worth the trouble. Could be just what the doctor ordered, I'm just not sure.
KB