The HQ ProgKey Universal is probably the one you’re looking for:
The boards are available from Oshpark and they’re relatively cheap since they’re so small. I’d recommend attaching wires to the boards instead of a header block, because it makes the thing easier to fit into tight spaces. The block ideally goes several cm away on the wires, or could even just be omitted if you can get a ribbon cable to fit. Then the other end of the cable can be configured however one wants, to fit a variety of different pad layouts.
I keep three full kits wired up — one for a SOIC8 clip, one for Emisar’s pad layout, and one for Lexel’s pad layout. One of the three has something weird with the usbasp device though; it stops working after one avrdude command, and then I have to unplug/replug the USB port to reset it. I’m not sure where that usbasp came from though. It looks just like the two I got from fasttech, except it doesn’t quite work the same. Have been meaning to order a couple more, and hopefully they’ll be more reliable.