Maybe it's me, but I'm still not clear what you have, and what you want.

Where are your M60's now? Is it part of a 5.1 system? Will the new bookshelves be in the same room?