Sounds like a good plan. I would still do some in that 1st tank of fresh gas. Would be a good place for strong dose of BerryMan's and run it thru with the first ride. Berry Man's can be found at Wally World close to the Sea-Foam. Red, Blue and white can I think. It is a little harsher than Sea-Foam for those really dirty jobs. I don't like to use it a lot but when needed it is great.