Stream music from PC to Phone

I have a HTC Touch Diamond with Sprint and a computer full of music that is running 24/7. I was looking for a solution to be able to browse through and stream my music collection from that PC to my phone.

Currently I have tried software called Didiom. It works fine but the quality isn't so good and it doesn't have a "shuffle" feature. Overall navigation is poor.

I was hoping someone may know of another solution to this problem. Any help would be appreciated, thanks.