Kev,
I would get to the bottom of the engine light first, just to establish that it is just the O2 sensor and not something worse.( Lots of previous postings about where to get those - not from Nissan!) There's no point doing all the other stuff only to find the engine is dying.