I reached level 41 and upgraded my HQ to 17. I changed team force since my old team force wasn't too active. I still follow the Way of the Berserker with my level 15 riflemen. Below is my current base layout. Not perfect. Still got raided, but at least I always got diamonds and intels from the attacks.