ECC Identity crisis/StorageScope problems/Migration Question

2 Separate questions here...
We have an ECC 6.0 Environment, split between 2 servers.

Server 1 runs our Repository, Store, Server, Performance Manager, WLA Archiver
Server 2 runs StorageScope, SMC

Question 1
When server 2 was created, it was put into a different subnet and had a different naming convention. We have just renamed it to match server 1 and to be put into the same subnet. We had slow communication between the two servers.

Problem is, its still thinking in some places that its the old name. I have gone through the Master Agent files and altered those to change to the new name. However, the FLA Archiver does not want to reactivate and i can't get logged into StorageScope. Anyone have any idea for a quick fix?.. or additional files to alter?

We are upgrading to 6.1 next week, would that possible fix it automatically?

Question 2
I would like to transfer the WLA archiver and Performance manager to Server 2. Any easy suggestions?

Thanks in advance for the help!