Seiko 7A38 - by the numbers

I might as well ask since I am not sure. Which is the correct size for the bracelet on my 7A38-7289? I will need to replace the clasp (one is on order) and so I will need new pins. Otto Frei has plenty. 

http://www.ofrei.com/page478.html

16mm Rivet Pins for 14mm buckles or 18mm pins for 16mm buckle?

Pardon my ignorance.  

I'm not sure why you'd want to order that style of Rivet Pins (of either length) unless you were planning on fitting a clasp with a safety lock.  You simply re-use the solid pins / short bead springbar that are already in your existing bracelet / clasp.

I don't think this has solid pins for part of the clasp. They are like the pins linked. 

However, the good thing is my clasp from Japan has hit the USA so I should have it soon. I'll bring it with me to NY and can either go to the Seiko boutqie or the NJ service center and have them switch the clasp and add a gasket. I called and they said they could. Much easier for me.