If you want to depreciate the value of a vintage Model 21, just go ahead and jack with the original chokes.
He said as a shooter, originality not required. I modify for you by saying nice 30" or 32" 3" gun with signs of field use and nice functional vented recoil pad. Does that help? As I said F-F would be preferred because it would leave room for choke alteration in each tube. This is like buying suit off rack at better clothier where pants were left long so they could be shortened by in-house taylor. I used Spector's when I lived in Albany NY.