Looks good. I would have suggested an AMD 3700/3800 to get to 8 core CPU, I think 2 more cores would be noticeable. But I agree that trying to go from a 3800 to a 5800 may not be as noticeable.

That price seems expensive for what you're getting, but I only really know US pricing - I just figured that with euro being worth ~$1.20 a $2000 USD system would be less than 2000 euro.