Take it slow and go with a 16g. They can be found used in descent shape for cheap, and it will be a pretty good match for your existing mods. Get a wideband, a logger, and something to tune with (DSMlink ftw) and you'll be making good power on that setup.