At this point I have replaced the head gasket, had the head checked, replaced the oil pan gasket, and the o-ring on the oil pick-up/strainer. Removed cover to water jacket and inspected that area. Still getting water in the oil and haven't seen any indication of how it is getting there...