Option 1
I'd go for option 1
For several reasons:
95/96 wasn't a million years ago, so some really clean examples must be out there
I'd build it with the kit I intended to use and ride, cos you know how you just evolve and perfect things when using them?
Imagine your dream frame turning up and just transplanting a fully sorted component group and having it all come straight together!
However I wouldn't be suprised if after a few touch ups and a good T-Cut you weren't a lot happier with the one you have
Personally I say only re-finish if the original finish is gone already or totally beyond redemption!
A bit of patina looks great to my eyes, be nice to see a bit more of that on here IMHO
And yeah you'd have two!