It sounds like you have a solid grasp on how to manage your project and I believe you should follow what you've laid out here. It definitely sounds like the right track to me.
agreed