Wait for Windows 7.
As for upsampling, well, if you must do it, it is probably best to play pre-upsampled files that have been converted in software, at least most cost effective for best SQ. Better to avoid it and get high-res music as it comes out.
-- Jim