Just one question. Do you really need access to all 11,000+ songs immediately?
I uploaded my whole collection (around 32GB worth) over 3g tethering and had no issues with upload speeds, even though I'm in the UK. I just listened to what was available when it came available on my phone.
I can imagine iTunes match is handy (especially if your collection is of a low bitrate) but with Google Music I am able to download my whole collection of I lose it in the original format I uploaded it (even my FLAC rips). Not only does it act as a streaming service, I consider it a backup alongside my backup I have on a second HDD.
Edit: I will say I had some uploads that failed but by the time it had finished it uploaded the failed tracks. Must have done it between restarts.
I selected 100 songs as a test drive and gave it a few days. They still failed