Absolutely, positively, no question about it, wait for Windows 7—it's only 9 days away from release.
As for the other issue, I've heard good things about the new version of Windows Home Server from
Paul Thurrott, so based on his experiences, I'd say go with that.