if you're still gonna try and clean the maf, you don't need to take the sensor itself out, you can leave it in the housing and just hit it up with the cleaner

but personally i think it's an ignition problem, do you still have the original plugs?