However the criticism Rigol gets just doesn't wash with reality from my experience.
Funny I was just reading about upgrading heat sinks and replacing poor quality caps in the Rigol DP842, another thread about some serious issues with a Rigol SA, and before that one of the endless Rigol scope bug threads...
I have a Rigol SA, PSU and scope, namely DSA815-TG, DP832 and MSO1074Z-S. I also have Agilent and Keysight SAs, DMMs and scopes.
The only bug that ever concerned me in actual use on Rigol kit was in the DP832 power supply where the OCP wasn't working consistently (although the CC did). It has been fixed in a firmware upgrade. I am not sure which "serious issue" you're referring to on the SA. The scope faults have been numerous but have never been something that I encountered in actual use. They too are fixed in firmware updates. In some ways you may find yourself better off with a greater volume selling device because these bugs are much more likely to be discussed in public.
I am sure that there are features in other brands too. Other than for enhancements and bug fixes, why else would all manufacturers frequently release updated firmware? Just take a look at the firmware release notes.
I'm not saying that Rigol QA is on a par with Keysight/Agilent, not at all in fact, just that if you think your Agilent TE is 100% bug free then regretfully I fear you are going to be disappointed. Irrespective of the brand, an engineer should always be wary of blindly trusting everything their instruments tell them, and know when something isn't quite right.