Especially since the ceiling limits so much I would continue to do the nearfield listening; it'll eliminate a lot of room issues.
You need to determine if you really want to trade away the panel sound. If you do not realize how vast the soundstage is, you may switch and lament it. I would suggest that if you have the space you might add another speaker to your stable rather than switch. If you still like the maggie, then keep it and swap them around occasionally. Check out my system here; you'll see I keep two speakers available to enjoy. This has brought tremendous pleasure, far more than owning one technology. I think you'd really enjoy having such variety.
I used the Tannoy Glenaire in review and it would make for a lovely nearfield speaker (see the review at Dagogo.com). It is a very easy speaker to drive, so it would be quite compatible with your current amp.
I would not preclude the exchange of amplification. If you like the pre, that's fine, but you've got a serious power problem with the clipping. Upping the power will do wonders not only for avoidance of clipping but in many other ways including extending the soundstage - a wonderful improvement and having more dynamic power to get better control of the speaker's drivers. The difference is quite dramatic. I would suggest no matter what speaker you secure that you eventually upgrade the power of your amplification. The nature of the speaker's sound will improve significantly when you do.
The only other solution to get more out of your amp performance is to move much farther toward a high efficiency speaker, something around the 92-95 dB or even higher range. That would be harder to find in a speaker with a smaller cabinet and will not solve the problem of your panel speakers clipping should you choose to keep them.
In relation to your room/logistics, perhaps you are thinking that you'll get far more placement options by shortening your speakers? Yes, you will. Lowering them will allow you to spread them out more, which will in a sense compensate slightly for the loss of taller soundstage; you can always tilt back the speakers to experiment with raising the soundstage of a shorter speaker. It may or may not be to your liking, but it's an option.
If you go with a shorter speaker and move them outward toward the walls, you will likely want to treat the walls with sound products, i.e. sound panels. In fact, even if you keep the Maggies I'd likely put sound panels on the head wall to diminish unwanted reflections. You might be surprised at the change in the sound of the room. :)