engine dies and i dunno why

so i threw it in park and it fired right back up
. when i got to taco bell i decided that it was too crowded so i left and got stopped in traffic again and it did the same thing
so i immediately went home. it is bone stock iron head l98 only things i have done are change brakes (2-3 weeks ago) a new battery and powermaster alternator(last week). it has a full tank of fresh gas and it only did this those two times today (i drove to football practice and back). it did have a little surging feeling earlier today.i don't know where to start
. could it be a sensor? fuel pump? fuel filter? dirty intake(i get the feeling it has never been cleaned)? 
any suggestions would be great because it is my dd and it's too cold to ride the bike in the morning.
it's like 10 or 12 bolts on top of the tank just open the fuel door and lift up that rubber "mat" - i think they cost like $50 or so
the fuel filter is however where i would start - and i highly recommend doing it right - pull the fuse run the enging until it dies (to make sure you don't coat your skin with fine petrol products) and use flare nut wrenches to remove the lines from the filter.
if you remove the pump, it might not hurt to take the little "filter bag" off and clean it with high pressure air or something.
but you can instantly tell when it's not working, by having a buddy stand by the back of the car (with the fuel door open) and turn on the key and listen for the electric motor whine while it primes the pump!





I suppose it could be EGR-related as well, if the valve sticks open at idle, mine does it occasionally in traffic.





