Forgot to mention, we use the SSA3032 since January and can highly recommend it, great value. That's used more for radio dev work here.
Our main EMC work horse up to 1.8 Ghz for 20 years is an HP 8591EM. Has a card with EU and FCC limit lines. Screen dumps to PC using HP software. Would highly recommend that too if you can find a good one at the right price. If you are not into fixing faulty RF test equipement, the Siglent 3 year warranty perhaps weighs against a 20 year old machine that may prove unreliable though.
Sounds like you'll be needing CISPR specified quasi peak and average detectors as a minimum, but as you said in an earlier post, the EMC bells and whistles that can come expensive are not must haves. Normal resolution bandwidths of 10KHz for CISPR 9 and 100KHz for 120 are not too much of an issue for pre-compliance tests either.
Martyn.