I'm also looking DS1054Z VS sds1204 4ch... but now starting thinking about rigol DS2072(hack) + external LA. 2ch yes, but faster...
Did you end up getting a DS2072???
I'm contemplating buying one, but only if the upgrade hack still works on the latest firmware that its shipped with