Has the fuel pump replacement fixed the issue? I am having the same problem with my 2015 and spoke to the service, I was told that it is a common problem and on several cars even though they replaced the pump several times, they are still having this issue intermittently. Also, how many hours was the labor on the fuel pump replacement?