I think the biggest issue with the current education model is that we still insist on educating children in batches based on their date of manufacture rather than on their ability level. If that gets changed across the board is their really any need for grammar schools at all?
This would be the ideal but I imagine the costs and restructuring involved would be astronomical.