I actually just picked my car up from the dealership for this issue. It was the Evap canister and it was clogged so they replaced it and now it works perfect again