Repair worn threads for floorboard screws.

[Trapdoor2]

Having had the floorboards out a time or three whilst recently speedometer cabling, I was wondering how to repair the 12-24 threads for the floorboard screws. Several of mine are barely there. A couple appear to have been beaten into submission with a body dolly and a ball-pein hammer (and then badly re-tapped). It appears to me that floorboard removal/replacement is one of those jobs that just never end. I'd like to have screws that actually work (the screws are actually fine, and I have a full set of washers too).

I suppose there is a "correct" way and...everything else.

Having done my time with sheet metal, I was thinking it should be a good place for a rivnut. McMaster-Carr sells a bag of 10, 12-24 rivnuts for ~$8. I actually think I have a rivnut tool around here somewhere...but surely not specific for 12-24.

Are rivnuts taboo? Should I use acupuncture? Chair Tai Chi? Cinnamon and vinegar?