I have not seen where you have actually diagnosed that you are experiencing vapor lock. If you don't confirm what you suspect, you will be chasing your tail.
Right after it stalled while driving 65 down the highway, then restarted in like 2-3 seconds, I pulled into a gas station and pulled the delivery line from the fuel pump. It burst a blast of gaseous air and then dribbled fuel. Is this not vapor lock?