Based on your CO2, HC and CO, it looks like you're running a touch rich, but not badly so. If the ECU was reset due to pulling the EFI fuse or disconnecting the battery, it will take a bit for the ECU to "re-learn" the feedback corrections for AFR control. If it was not reset, I would do so based on the work you had done. It would not hurt to check timing just in case the shop was not aware of the TE1 and E1 jumped requirement...if they set timing without doing this, it will be retarded for normal ops. Idle should be 700 RPM at idle for the NA motor.
Not sure why they replaced the O2 sensor...it didn't appear you were having that bad of a mixture issue on the 1st test. Same for the ISCV...were you having an idle problem?