I'd rule headgasket out, well, drain the oil and check for swirls of yellow. If it looks pretty clean I wouldnt worry about headgasket. You would most definatly see water in the oil, as well as oil in the header tank. Not too sure about watercooled oil coolers, Ive seen it on golfs where the header tank is pretty much full of oil because of this.