Sounds like Google Music has gotten a free matching service which should save a bunch of uploading:
http://www.theverge.com/2012/11/16/3...d-match-europe
It apparently already works in Europe and the US should be coming soon, so hopefully it'll work in Canada too. I tried with a UK proxy but it didn't seem to work even though I downloaded the latest version of the program. I guess we'll see if it'll work from Canada.