I think there should be a law stating the headlamp MUST be able to be removed using simple tools.
Volvo have the right idea on the V50, 2 'L' shaped jobbies that just pull out and the light pops out. Similar on the mk3 Mondeo but you have to take the grille out on a Mondeo.
Try doing things like Renault Meganes and mk4 Golfs..