Check your fuel pressure when it acts up. If fuel pressure remains constant it’s not vapor lock.