Incorporating new code and components is a common aspect of our methodology. New components can come from various sources, including finishing generated code. Furthermore, integrating generated code and new code on a broad scale is typically done by the tool. We already did both of these types of tasks, as planned, in your engagement.
Your upgrade project should take you where you want to go; you need to minimize total cost of conversion during the upgrade and then total cost of ownership after. Towards this end, GM sells and supports a programmable software re-engineering tool and related services. We help our customers re-implement large, complex business applications in .NET according to their new design. The thing that limits the new design is the capability and capacity of resources available, and the time constraints, not the tool.
Some source codes require a lot more transformation to fit the desired design. However we have found that given fixed resources, teams can complete a more ambitious upgrade with our tools and methods. Please consider this: http://www.greatmigrations.com/en/resources/myth-busters.aspx