Checked the MAF yesterday and it was not obviously dirty, gave it a bit of a clean anyway and will look at replacing it. Pulled out the MAP sensor today and it was FULL of gunk. Washed it out with metho and it seems it might have helped but will have to wait until I do more testing.

Howard