I had the entire deck repainted two years ago. For non-skid we used Griptex by Awlgrip. There's three sizes: fine, coarse, and the new extra coarse. I used coarse, but in retrospect the extra coarse may have been better. If you use good deck shoes, even when wet the traction is ok. But if someone isn't wearing deck shoes, they'll slip. With these grip additives the key to getting a uniform look on the deck is to make sure the painter mixes the Griptex with the paint well and freqently, otherwise you can get an uneven distribution of the grip material on the deck that doesn't look right. Like you we had few repair locations, but opted to repaint the entire deck so it didn't look like a patchwork of repairs. Preparation is key to a good job. We removed all the hardware and sanded down all the gelcoat grip pattern so the base was perfectly smooth - and thats a lot of work! But the results were marvelous, I get a lot of compliments and the boat looks like new on deck. Good luck!