replace the MAF, cleaning isnt guaranteed to work and the symptoms sound MAF related, try one from another car if possible and yes the sensor s could be the cause try changing back to the originals and see if the fault goes away