I would have recommended Harbeth, I have them on a bookshelf, but they are not a good match with McIntosh (no hate there, I had that setup and it was not a good match). And if you liked the sound of your B&W's, you probably won't like the Harbeth sound. The Raidho and Kef are good suggestions as I have heard them, and they were also recommended to me as bookshelf's when I was looking. I heard the Wilson's, but was not impressed for the price, but they would work if you can hear them first. Other suggestions here seem good too, but are ones I haven't personally heard.
Enjoy the new home. Jealous of the golf course!