Refilled with 6 quarts (extra quart for factory oil cooler). Ran it for 20 min until it started to surge again. Checked it right before running, right after running, then again 5 min. Later. Raw gas smell came back after running and as far as I could tell stayed the same when checked yhe second time. Also checked the tbi after running. No leaks from gaskets, body or drips from injectors. Checked spark plugs again and still white like lean running.