I would not go to 35 gallons - sure you only run 12 miles now, but it would be tough to get you out 20 miles and back with any trolling or extra running time. Suppose your boat gets 2mpg - that means you will use 20 gallons getting out and back, and if you motor to a few spots while out, you're getting close to running out.
Don't forget that the USABLE portion of the tank is about 80-90% of it's capacity, depending on design.