Loading firmware via JTAG without soldering on headers every time?

I am designing a board right now, and I can't leave the JTAG header in place due to height restrictions. I solved the problem by making this custom footprint:

For prototyping, this 1.27mm socket can be soldered into place. For production, this set of pogo pins should mesh with the circular areas.

I haven't tried it yet, but I think I'll put some plated through holes in the center of the circles to help with locating the pogo pin block. The holes would need to be smaller than the pins, of course.

I ended up solving this by using a drill bit to ream out the plastic around the header of the IDC cable, and then jamming the pogo pins into the holes.