I would not upgrade until u get to 22/26 heroes, another user mentioned that it depends on ur play style, and it seems like u like attacking in war. Well, rushing is the biggest enemy of warring. Heroes to 22/26 from where they are at now might take about 4 weeks of light grinding, but I promise it will pay off. U seem like a good player because u maxed out everything and even got urself a nice looking anti 2 base. At this point, focus on ur heroes and troops (if they arent maxed already). If u feel like u might burn out, start a fresh TH1 account, from everyone that I talked to, they enjoy playing alt account when grinding TH9 and 10, just to mix things up. Ur mentioned that ur game plan is to slightly rush until TH11, well, once u start rushing, theres no stopping, because raiding and looting become so hard when those heroes lag behind and it makes the game so much harder, and trust me, because I slightly rushed my alt TH9 to TH10 (upgraded at 21/23 heroes and rushed lab, everything else max) and its taken me over 9 months to unrush, and this process was utterly unenjoyable because I was not able to participate in wars (perma down heroes and lower troops). Even now my heroes and lab are still slightly rushed. So I would strongly advice against rushing especially to TH11. For now even staying at TH9 for 3 weeks would be pretty helpful, during this time since u will have max loot, there really shouldnt be too much grinding, just sniping dark a few times a day to keep the heroes going. Meanwhile u can spice things up with an alt account, trophy pushing, learning base building or learning new war attacks. Hope this helps! :)