I have the same issue but working mainly with Customization Comparison Utility to manually track especially changes because this may cause a biggest problem.
If you want we define whole process of updating environments and code versionnig so I can send to you (we have presentation how to do it).
My Dynamics CRM Blog: http://bovoweb.blogspot.com