Sounds good. As far as cleaners go the favorite on virtually all car, truck and bike forums is Chevron Techron. Gummout Regane is almost the same product and also excellent. I stock up on these at Advance when they are on sale 8) for 1/2 price - $3 each. A word of caution - it's a damn good idea to use these products shortly before an oil change.