Cant agree more with your idea.
I think they should indeed fully separate war base and normal base>
Changes i would suggest:
War troop donation from war camp
Normal troop donation from normal camp
War troop preparation from war camp
Normal troop preparation from normal camp
War spell preparation from war spell factory
Normal spell preparation from normal spell factory
And last but not least hero`s available during upgrade on war base map.

