Have you taken a look at the new X6?
X6 has :
1. comes bundled with a good headphones
2. looks better than 5800
3. available in 2 version 16GB and 32GB
4. capacitive touch screen
5. newer version/release on symbian S60 5th edition
But of course it is more expensive than 5800 xpressmusic