I went through similar when I converted the headlights for driving on the left. I also wanted something brighter than the crappy sealed beam units that came on the car, so changed to separate reflectors with QH (H4 and H1) bulbs.

For the low/high beam (outside) lamps I ended up taking out each brass terminal in the 3prong socket and retensioning them and they seem to be holding ok.

I am not sure if you are changing your high beam (inside) units, but the H1 bulbs have only one pin, using the holder (which has a male pin on it) for the ground connection. I bought two-pin male sockets and single-pin female sockets (on ebay) and made an adapter with the bulb/holder end as flying leads. As you say the pins are shorter now and just hold... I use cable ties to hold the adapter cable in place and to keep the sockets from vibrating off.

I found the sockets on ebay were of variable quality and ended up buying a couple of batches of each and chose the best (ones that didn't drop off).