I think Adywan plans for an all new matte. Not sure if he'll use the live action boxes there, but that would be awesome. Seeing how Adywan is getting the HD camera, I wouldn't be surprised if he built a model docking bay and ships to go in it.
Either way, I think if we do mockups for the docking bay, we should be matteing AROUND the live action shots.