The solution is quite simple; speakers first. The reason is that should you upgrade the amp you will only see a different flavor of the current speaker's performance. However, should you upgrade the speakers to a different genre, ie. horn hybrid, you will have made a sea change in the system that no amp can duplicate.
Do not overlook changing genres of speakers. Maggies are lovely for certain aspects of sound reproduction, but they are also weaker in other areas; I know whereof I speak as a former Maggie owner and reviewer. Different genres of speakers, such as the aforementioned horn hybrids, can do things such as dynamics that shame even mid-size maggies. You owe it to yourself to hear some of these other speakers. If you wish to discuss any of the speakers I show on my system here, or have reviewed for Dagogo.com, feel free to contact me.
I am currently reviewing a full range hybrid speaker that has similar capacity in terms of definition retrieval to a panel, but has capabilities in terms of dynamics that far outstrip Magnepan, and even the Kingsound King III ESL speakers. I suggest that you do not let use/non-use of the subwoofer be a determinant in what direction you go in terms of speaker. Having worked with subs often I would not let them be the determinant of what kind of speaker I would select.
Further, you may still enjoy the amp with the new speakers and feel contented that you do not need to upgrade it. Having been through such things many times, I believe that if you upgrade the amp first, you will soon be itching to upgrade speakers, too, and will ensure potentially spending far more on the project than you have to.
Finally, perhaps you are one of the few, the abundantly blessed with $ and space to have it all. Perhaps you can keep the Maggies AND add a new speaker of a different genre. Trust me, this is a sensational way to participate in the hobby, a literal form of having it all. The means of being able to flip speakers and hear a rig fundamentally differently at will is a fantastic form of variety imo not to be missed if one has the means.
As usual, to the community, YMMV