We have just completed a similar update on our site using pretty much exactly the technique you describe above. As you say keep a real close eye on the 404 pages as they can catch you out. The other thing to watch out for is to make sure you maintain any historical 301 redirects as they are easy to miss when implementing such a big change. We suddenly found loads of old links that we didn't even realise existed!
