Just turn off the auto high beam feature for good, and switch between high and low beams yourself. The way it's implemented in the Mk5 makes it very easy and convenient: push the lever towards the dash to turn the high beam on or off, pull it towards you to give a short flash.
In the Mk4 it was a bit awkward, because the lever went only one way, and the difference between a flash and a high beam activation consisted solely in the force you put into pulling the lever. Countless times I wanted to flash and I turned on the high beam instead because I pulled the lever just a tiny bit too hard. Nasty design. But in the Mk5 it's bliss.
The thing is, auto high beam doesn't mean that you simply forget about it. It's not like the auto headlights feature, which works consistently and reliably. With the auto high beam I was always, always paying attention to what it was doing: "Let's see, now it should switch to high beam, will it switch? Oh, yes, it did. Cool! Now, a car is coming the other way. Will it switch to low beam? Come on, come on... oh, it did, that's good. Now, there's no one coming the other way, will it switch to high beam? Hmmm... no, it's not switching. Why won't it switch? Oh, it's probably because of that street light over there. OK, I'll do it myself." And it would go on like this for the entire journey. Very tiring and annoying. It's much easier and more convenient to just do it myself every time.
That is why I turned mine off too!