Forgot ICSP / in-circuit interfacing of pins on Atmega328P in TQFP-32 package
It seems to me that you already have a good solution.  All you have to do now is make it mechanically sound.  Drill a small hole, insert a terminal pin and crimp or glue it in place.  Solder the jumper from the 0604 to the pin.  Use the pin to connect the ICSP wire.