I would think option 1 is your best bet.
IMHO, the problems with option 2 will be getting the OBP wraps to match well and that a 14 inch Oyster Black floor tom is a somewhat rare and expensive item to purchase ...check Ebay for example and see the pricing on them
There are more knowledgeable members on this site that can chime in a little more on this.
I have hunted for a Oyster Black set 22 inch bass with rail mount for 6 months with no luck (found only ones with the dual tom diamond mount holes) so recently bought a 66 Oyster Black set 22/16/13 that match well from 1965-66 and I use a 80's Rocker snare that has been rewrapped with it
Hope this has been of some help to you, HummDrum