25,000 is a limit for uploaded and matched songs. iTunes purchased songs don't count so if you buy your music from iTunes there is NO limit.
So if you have 24,000 songs you ripped from your CD's and bought 30,000 songs from iTunes you would be fine with 54,000 songs in Match account.