Replaced my standard H4 headlights on my 17 plate kombi highline with genuine H7 headlights from a 17 plate Caravelle.
It's literally just plug and play, no warning lights, no VCDS, just swap and go. Does require removing the front bumper but really not as bad as it sounds.
IMO the H7's are...