I really doubt you'll see any new higher end EDGE computers within the next 2 years, so I wouldn't hold out for that. IMO the 500/800 are here to stay for a while.
That's a good point. While they haven't been updated in 2 years, they don't really have any competitive reason to upgrade their units without any meaningful competition in the marketplace.