The numbers don't look like they will drop enough with any of the additives nor the oil change to pass. Unburnt fuel in the oil shouldn't be causing that high of a reading. With the timing correct, new head new/valves adjusted correctly, and new O2 sensors, it looks a rich air/fuel mixture, bad cat, or leaking injectors.
I would start with an inspection of the intake and exhaust system(ahead of the O2 sensor), unmetered air will cause the ecu to richen the air/fuel ratio to try and correct for the lean condition the O2 sensors are measuring.
What is the CO2 readings? According to my smog tech, readings under 13 is often an indication that the cat isn't working properly.
