I'm also in Canada, and while Rdio does have a lot of the stuff I listen to, maybe I should try iTunes match as well.