This is one thing that I seen coming. I think you are making a big decision and I am sure going back to the evo3 16g setup for the street is a smart move, but you could kick it up a little bit with a 20g. The spool would be just about the same and you would get alot more power.
Whatever you decide, I am sure you will be happy, so that is all that counts.