Keep your eye out for good NOS deals of not-so-well-known brands. I got a box of 5 National 6267/EF86 (still in the 5-lot box!) the other day ...
Be very careful with National (Richardson Electronics). National and Richardson were simply re-branders, and you might have anything from an American or western European tube to modern Russian or Chinese stuff. There's just no telling with them.
One of my customers just bought a NOS Tesla off ebay. It is identical to the JJ ef86.
JJ bought a part of Tesla's manufacturing equipment. Too bad most of the knowledgeable engineers are gone. So it's conceivable that some JJ tubes will look just like older Tesla tubes.
The gold pin EF86 from Tung Sol is supposed to be the high-end tube and indeed has a high-end price.
You're only paying extra for the gold plating on the pins. I personally wouldn't buy any modern tube just because of the gold pins. Old-production tubes did use gold pins on some premium versions which were truly better in a number of ways than the prototype tube.
5654 is another option....
I might have to beg you to save those 5654's (and 6AK5's) for me! I haven't used them in a guitar amp, but have some tube-based Hewlett-Packard test gear which uses them.