not an expert. but from the info you gave, your water return is goin into the hole that you should be getting an oil feed from (can get fed from oil pressure sensor hole or bolt next to it {the one between oil pressure sender and oil filter}.) all your water feed/return should be coming from the back area of the engine. where the water hoses are.
so yea waters dumping into your oil. easy fix though.