Please make sure to check the oil cooler first!
I've actually experienced something similar on an old TD. The first workshop was just as clever, and they immediately took off the head and replaced the perfectly intact head gasket. When it still pushed oil into the water, they were at a loss...
I used an all-purpose cleaner to clean it, and it worked okay, but it needs to be done quite often.
MfG. Michael
VW Golf IV TDI GTI 4-Motion Bj.2002 MKB/GKB: ARL/FEK
VW T4 Pritsche TDI Bj.1999 MKB/GKB: AXG/AFK (Selfmade)