I guess I'm a little late on this one, but I would have suggested an Infrant ReadyNAS. It's definitely more expensive and bit more difficult to setup, but the drives are user-replaceable, and it's, therefore, upgradeable.
I can't talk to the more recent revisions, but at the time that I bought...