Knightcrawler - Your way is the best, (No dispute necessary, or even possible! :) )
I have about 450 Zelda Songs, and about 57 "extra" Non specific Zelda related songs, but am unable to deliver any of them due to my modem. I have said it before, and am willing to say it as many times as necessary.
So until we can find this 1000+ midi thingy, VGMusic really does have everything that you could ever want, (With a few exceptions.. ) Also, some things that are found there really work well. I used the Z4 room of rites midi as a boss intro, and then a SMarioBros3 FinalBowserBoss midi as the boss music, -Fab-u-lous-! *snapping*