It's possible to get iTunes to change its idea of where the music files are. I've done a similar amount of iTunes library moving, and it's been quite amazingly reliable through all that upheaval.

A combination of consolidating and setting the default media location and re-consolidating and holding option on launch etc will eventually get it to find all its media.