Hi I have been having problems with my R reg 2litre 16v eco tec gsi over the last two weeks

The car started cutting out (i was low on fuel at the time) then a few hours later the ecu light came on! I have done the paper clip test and have two fault codes crankshaft sensor and cam shaft sensor. I changed the fuel filter, new set of plugs and some fuel cleaner.Was ok for a day then started cutting out again, so today i changed the both sensors.The crank sensor wire was knackerd just as it goes into the sensor so i though i had found the problem. Started the car and it seems much smoother but the ecu light still came on!

I did the paper clip test and i still have the same two fault codes.I have tried turnig the ignition on and off thirty times leaving a five second pause when turned on.This made no difference.I then disconected the battery for ten miniutes still the light came on . Have i fixed the problem and Do i just need to get the fault codes cleared using tec2 at vauxhall? is there another way to clear the codes?, or could it be something else? Please can any one help?