Choose diagnosis first when generating Treatment Plans

I need the ability to select a diagnosis before the case snapshot and treatment plans are generated. Right now, if the system selects the wrong diagnosis, or an unbillable diagnosis, I have to rewrite the entire treatment plan to fix it. I am fine with the system suggesting a diagnosis, but this should be editable before the case snapshot is created, or an incorrect diagnosis makes the whole workflow useless.