2005 Camry bucking and surging on acceleration

2.4l engine with 200k miles.  When accelerating the car will
rapidly lurch forward and back.  The rpms will alternate and
the speed will slowly increase.  This issue will stop if I
continue holding the gas, accelerate harder, or release the
throttle.  I have cleaned the MAF and have a OBD scanner
so I will attempt to monitor throttle position.  Spark plugs
are also new as the old ones were worn after oil
consumption a year ago due to a blown cover gasket.  I'm
suspecting an O2 sensor or possibly a fueling issue and
may replace the fuel pump and filter.  This problem has
been plaguing me for 4 months now and would appreciate
some assistance.  Also have cleaned the throttle body and
injectors thoroughly.