earnesteo - 10:48 am on Jan 24, 2013 (gmt 0)

Out of curiosity, is there any possibility that you could look at relocating your moved content to the old CMS to simplify things for yourself? Since you're no longer going ahead with the move and only 1/4 of the content is relocated returning it to its original location may help alleviate some of your concerns.