I drilled and tapped for a fitting in the water pump inlet for the suction side and used the port near #2 on the head for the pressure side. I plumbed hard lines. Seems to work good.
One problem with my approach is the water pump is now a modified part but I don't see that as a major problem. If I had a water pump failure and had to replace it on the road I would just have to plug the pressure port and go without heat to get home.