Hey thunder,
I bought the correct 10-24 rivnuts from Home Depot of all places and they worked perfect. They come in packages of 6 and you don't need to buy the rivnut tool. It comes with a long screw, collar and allen key. Remove your old nuts, insert the new follow the instructions on the package (very simple) even I could do it.
Good luck,
Karl