Go with the retune and if that does not work I would take out the clunk , flush the tank and replace the clunk. It does not hurt to clean the carb , or at least check the screen to make sure its clean. How old are you fuel lines and have you ever changed them? Old fuel lines can get brittle or soft depending on the type of line you used. Could be as simple as a new spark plug too.

Andy