If you do go with the B&W 805's then be SURE to at least get into the 805S's which is the last one that were produced before the recent swap to all diamond tweeters for the 800 series. The 805S's are superb speakers and in some ways can give the Maggies a run for their money especially
with a new amp that you are suggesting. Sometimes you just need to try things yourself to satisfy curiousity. You may end up coming back to the Maggies but at least you will have tried something else.
PS. The 804S's are even better and an often overlooked speaker in that line. They have to be the latest S version though, the older ones didn't cut it.