You are def, amp limited at this point, which is the same problem I experienced with the Mal-X's, I kept on clipping that EP2500's or the QSC 2502's, but upon upgrading to the larger amps that have in this case unlimited power, I left those problems behind.
2 good ported subs should be adequate in that space if you don't like ridiculous amounts of bass like I do... I would never suggest you get a 21" driver.... The 18" Mal-X's are a great driver for the money and are extremely linear.
Isiberian is correct here, I would look to upgrade your amp, you can never truly get the amount of excursion out of a driver that needs more power. Get that right and you will see a noticeable change for the better... Then you can build another and you should be good to go...