Hey mate, sounds like the fuel cut solenoid to me, usually gives those kind of symptoms. .

Sent from my SM-G930F using Tapatalk