Mick B BRAVO for your project.
Exactly why do you think it needs CAL? After major repair? Water damage?
1/attenuators are needed to reduce reflections and aberrations, 20 dB is a factor of 10X in V. No effect on the scope V ranges at all.
We use Mini-Circuits HAT-x series inline BNC attens very fine , BW DC- 1 GHz and avail in all dB atten.
https://www.minicircuits.com/WebStore/dashboard.html?model=HAT-20%2BAny scope with sufficient BW and sensitivity is fine. Avoid Chinese knockoffs, we use Tektronix 2465B.
2/ Easy to locate the proper manual for your SN.
https://www.keysight.com/us/en/assets/9018-05117/user-manuals/9018-05117.pdfhttp://userequip.com/files/specs/1562/HP%208116A%20Operating%20&%20Service.pdfEpay or Artech has printed versions.
3/ Suggest to reRead the 8116A spec and do a quick performance check, as the CAL is not trivial and can make things worse.
Beware that the freq indication is NOT a counter and can have errors of a few %.
I had several 8116A, and NEVER had to do a CAL.
Most have sticking rocker switches.
4/ I recall a battery to store the last setup but the CAL is all analog pots and caps and NOT dependent on the battery.
Except for the loud fan and rocker switches, its a great unit, very versatile.
An HP classic!
Enjoy and Bon Chance,
Jon