Nice setup Rabb, I use audiogalaxy where you dont upload the music just link it to your pc and stream it anywhere. Main reason why i got an iPhone5 on 3 as I get unlimited 3G so only got a 16GB iPhone but it has access to 300GB music :wink:
My PC stays on 24/7 so that doubles as my server and I dont need to stream because I have every room with network sockets, except the bathroom. Only thing thats wireless us my phone and tablet.
Loads of options but personally I would wait because I think 2013 is going to be a big year for streaming devices