Hi again, sorry for the delay, I haven't checked in much lately. Thanks so much for the continued suggestions.
I think there's enough spring left in the contacts, I didn't force it that much, just enough it seems to be just shy of good contact. Something along the lines of what you've suggested...