I can't say what YOU should do, but I'll point out that digital oscilloscopes, like computer gear, have been coming down in price rapidly (maybe because they ARE largely computer gear).
Suppose you have $800. Do you spend it all on an $800 scope today? Or do you spend $400 on a cheap scope today, put the other $400 in the bank, and wait five years to upgrade? Five years from now, your $400 plus interest will probably buy much more scope than it would buy today. On the other hand, you'd be stuck with a lower quality scope during those intervening five years.
I'd suggest it's probably not a great idea to invest a large amount of money in a scope you don't have a good current use for, because scopes lose value quickly, so they don't make good investments. But it's also not a good idea to eternally postpone the purchase of gear that you could be using, on the theory that the gear will soon be cheaper.
The way I see it, you should buy just a little more scope, not a lot more, than you currently need. And probably plan to buy another one in a few years. In this way, it's not that much different than buying computers.