TH 9 Base Design Review

I have created this to get a suggestions on how i may improve my base design. Below are my war and non war bases. My war base has the TH inside and non war base TH outside. My non war base has the TH outside so that I may get a shield when not in war. I had to do this because, even in crystal 3, I was getting raided for <100k gold, ~100k elixir (which isn't a current priority due to all elixir research and upgrades complete for TH 9), and only loosing DE from drills. While that isn't much of a loss, I would have to spend ~50k gold to rearm traps after each raid, never had my heroes available, and could not keep cc troops due to constant raids because I would win and never get a shield. I think I went +64 trophies in 1 hour and 45 minutes the first day I had it which is one of my best streaks due to the fact it's the first base I have designed with my TH not on the outside. Any and all suggestions are welcome and appreciated for both of these bases. That being said, I know I need to upgrade my cannons, air d, and walls. My upgrade priorities are usually the most expensive first. I intend to start upgrading 1 air d at a time once i upgrade my air bombs to level 4 (currently all are level 3) and my air mines to level 2 (currently all level 1), along with 1-2 cannons at a time ~2 days apart. I want to be able to defend DE storage at all costs, and gold storages as well in my non war base as these are my most needed resources. I intend to research DE troops (witches finish in about 1 day, then Valkyrie, then golem) and upgrade my Queen and King so DE protection is a must. I have removed decorations that would block you guys's view of each bases troop placement border and use screen shots of the village edit mode so that said borders may be seen. I have spread everything outside of my walls out so far so that only hogs or air balloons have the potential to drag out my cc troops and to make attackers waste time taking those things out, the more time spent outside my base the less time they have to get to my resource storages haha. Anyways, thanks for the help and suggestions, and again my war base is the one with the TH inside and non war base TH outside.