1st thing you should change is your mechanic then do the following:
If car was not giving you any trouble just light was bothering you then
you should have Erase ECU DTC code you can do by using diagnostic tool, Your light would have gone
2nd Check your MAF sensor some time if MAF sensor is disturb for any reason its upsets O2 Sensor
Things to check on your MAF sensor there should be small diode is it present if it is then try to clean your MAF sensor with CARB cleaner or Brake cleaner, is there any leek on molding which is holding sensor inside MAF body, if there is a leek then I will suggest change your MAF sensor
you may find MAF sensor for between £40 to £60 from any Salvage yard
Please check my other posts and let me know if you could suggest any of the issues I am facing with my Nissan Primera SE Plus 2000