Takes forever to deliver iTunes Match Results

I am approaching the magical 25,000 limit of tunes and have two questions.

1) It still appears that the limit is a hard 25,000. Unfortunate that Apple does not offer an additional capacity for an additional fee. Confusing why not.

2) It takes FOREVER to deliver the iTunes match results. While this is going on iTunes it pretty much useless. can not upload additonal musice and also can not update the info for any given tune. I am using a Time Capsul for my WiFi connection and the WiFi connection is not the issue. Disappointing.