Am I the only one with this problem?

Left side, the retaining clip (the curved bent wire thing-y) came out when removing the bulb. I can't get the clip back in cleanly. I can get the new bulb to stay put, but the bulb alignment is slightly off. It looks like the retaining clip should be held in at 3 places, but I've only got 2. Any tricks or something I'm missing?

On the left side, the washer reservoir is so close to the lamps, that there's minimal clearance for working, or good visibility for what I'm doing. I tried to remove the washer reservoir, but couldn't find the clip holding it after I removed the 10mm bolt.

All in all, I've got the bulb in, but I'm not happy with my job, and want to do it again.

Thanks
Al