Here is an update, I replaced both Oxygen sensors (both upstream and downstream) and it didn't seem to help at all.
Today I replaced the EGR valve, spark plugs, cap, rotor, and wires and she runs like a top again :) I suspect it was the plugs, but figured it was all good to do.