I second the 20dB attenuator. Even if this SA doesn’t need it, some do, and it’s a good habit for anyone using an SA to have, especially if we ever get another SA in the lab.
I also suggest avoiding BNC. For one thing, BNC lowers the barriers to misuse in a general access environment with the full range of skill levels. Also, most accessories will be SMA or N.
For purposes of buying cables and accessories, it would be good to standardize on N or SMA connectors, using SMA or N adapters on the RF equipment. I suggest SMA, since those cables are more flexible and easier to store and manage, and will fit more preamps, probes, etc.
If the RF equipment, cables, and accessories are kept together in a special section and have (kind of) special connectors, they are less likely to be randomly abused. For example, if cables are SMA, it would be less likely for someone to borrow one to hook into a scope, and then roll a chair caster over it.