So given where this is going would you even bother going and buying a Rigol now?
Now? Well, there may be a dilemma, but two years ago when I wanted a scope, DS1054Z was all the rage. I bought it because it has 4 channels (2 is nice, but 4 is more), hackable and affordable (or at least, within my purchasing power; I
was asked by family members "How much did it cost? Do you really need that? What is it, anyway?" "A lot. No. An oscilloscope.").
If I was buying a scope today, perhaps I would choose some other brand and model, but two years ago, it was a good deal. Now I have a scope and honestly don't see a need for another one. This one is perfectly fine.
At this moment, even if Keysight was the same price as this Rigol, and had better features, I still wouldn't buy it for one simple reason - I already have a scope. Keysight was late to the party. I suspect I am not the only amateur hobbyist tinkerer that made the same decision.