I'm actually going through the same exact issue right now. I havnt changed anything out yet except the battery and ofcourse it still does the flickering. Thanks for letting us know what you did so far. Saves me from having to change all that out myself.
My next step was going to change out all the ground and such as well, but like you asked, what is the best gauge to use?