Would replacing original fuel cooler unit on 2005 525 EFI's eliminate vapor lock? Annoying issue. OEM replacement part;8M0125854 - COOLER KIT-FUEL

Make sure you've got good fuel pressure. AND that it doesn't bleed off when you shut the engine off. Then make sure there's no obstruction in the cooler.

.......