Lucius - this is pretty much what I've done and it looks like it's going to work. geez what a terrible mess.
