As much as i'd hate to say , but 5800 is probably the best for you .
Music is great ,video in that large nHD screen is best i've seen in cellphone . Camera is not good , just usable , video capture is great though , also tv out.
I would have suggested touch diamond , but with its poor battery life its the worst reliable 'phone' .
Btw , from your query about wifi , seems like internet is a big importance for you . And in that case , trust me , get a n95 8gb or n85 or e71. 5800's browsing , though looks very good and 'cool' in paper is not as great as it seems to be. In fact except iphone , no touchscreen browser is ideal for long browsing sessions . The reason is that swipe to scroll in most touchscreen becomes really tiresome after sometime . In a n85 you just have to press a key to scroll with minimum finget movement but in touchscreen , you have to drag your finger repeatedly across a 3.2inch screen to to the equivalant of a single keypress . While this may look cool first , becomes really really tiresome after few minutes of browsing long pages.
Most nokia priority dealer have live demo of 5800 , i'd suggest you to try it . Even if the phone dont have internet , reading through some long help files would give you good idea about browsing experience.