FOR THE 2nd BASE:
You should swap the DE Storage with CC to make it hard to drag / lure. (But, if you love your DE, then just let the DE storage at center)
Put the Air traps outside, you can put Giant bomb there.
FOR THE 1st BASE:
Scramble your defenses. (except for Mortar and Air Def)
Put your Hidden telsa inside, you'll need to change your base a bit for this. (Not really necessary though)