I have balanced most of the things you pointed out, along with a few other things that I thought would improve scaling, before this I would usually be able to get to about round 35 and then immediately die, however now I got to about 70 (and balanced a bit more even after that).