Just go slowly. After all, you apparently know how to write new code from scratch and in one form, otherwise you won't start it, right? You only need to use existing "wrong" code, so your only "real" problem is to do if faster, right?
First of all, don't overvalue your already created code. You can easily throw out some of it out. Try this:
- Don't shuffle you code in two existing forms. Create third form and gradually move your existing code there.
- Don't overuse Designer. Your problem is that you already allowed too much auto-generated code which you do not control as well as your own, due to binding with the Designer. Don't repeat this mistake: use the bare minimum of visual programming — do only the visual things, basic layout. Everything else try to do in code.
- Don't sort out clash — prevent it. Start with refactorization. Use refactoring engine to rename everything to avoid clash. Use refactoring engine. It will allow to rename all names, including auto-generated. Never ever use any of the auto-generated names like
Form1
or Label1
. Such name brutally violate (good) Microsoft naming conventions. Give everything semantic names.
Good luck,
—SA