ITunes re-mapped my music location - how to fix?

Question

First, I do not have iTunes manage my music. I keep my files on a network mapped drive and copy them into iTunes.
For example, my music is on:
file://localhost/Volumes/mp3
Recently I moved my music to a new external storage unit with the same share name. I *thought* everything was ok as it could still find my music even with the other server shut down.
However, just today I realized that iTunes has renamed the path to all my music:
file://localhost/Volumes/mp3-1
I can't get this to change. OBviously you can't just edit the .XML file as the .itl file will just overwrite it.
So... how was iTunes able to change it once... and how can I set it back to mp3 without the "-1" appended?
(I've tried deleting the tracks and re-importing from export (which has the right share path) but it somehow still wants to go back to mp3-1 for most my library.  somewhere, somehow, itunes is stuck thinking mp3-1 is valid.  I need to get it to stop thinking that)
Thanks.

Answer 1

Basically I had a Windows 2008 server share set up with all my music files.   I'm moving my Exchange to the cloud, removing my Active Directory, and put all my files (including music) on a NAS box.    I basically re-created the same shares on the NAS box, sync'd the files over there, removed the old mapping and turned on the new one...  all went perfect because it didn't point to a servername specifically iTunes was just fine.
I think along the way I turned on my old Windows box to get at something else and left it on.   My guess is at some point I rebooted my Mac and the mapping stuck.   Apparently when there is already one there, it will append the "-1" to the next.    Why iTunes decided to look at the second for some but not all files is a mystery that probably won't be solved here, though its worrysome.    (since that time I actually removed the shared on the WIndows box just in case I have to fire it up again)
I'm going the route of deleting the .itl file and re-importing the .XML.   We'll see if that fixes things.  
I think at some point I might have to bite the bullet and let iTunes store and arrange my music.   Since I can remember I've used a network share and a specific naming convention for all my music... it will be tough to let iTunes take control.   I think if I do it will be much easier to avoid these types of things in the future.
Apple should let people (advanced users) modify the data in the .itl file to fix this type of screwup.   In their attempt to make things easy they basically make fixing mistakes impossible.