I have a similar issue with my 2016 2500; just a few weeks ago, I was having the same symptoms of the lope/surge.

I'm running a 2nd Gen swap, though, with a Borg 467.7 turbo.