That Rigol with tracking generator is the a really good tool. Build up a return loss bridge for SWR
measurements out to the machines max 1.5ghz. There are several good and easy designs on the
'net. Likely you will end up making a bunch of "fixtures" for testing various things.
Another handy item are the Minicircuits and Qbit block amps for times when 0dbm is not enough
as well as a good Narda or Bird 30db power attenuator of the 50W or 100W sizes.
Sorta like bench power tools like mills and lathes, you get that then the other gadgets start to appear. ;)