Well, I think it's fixed...finally. It turns out that during the engine wash a few weeks ago, I somehow damaged one of the coils AND the MAFS. Changing one or the other didn't cure the problem...

This is odd as I've washed the engine many times before without incident, maybe it was just a coincidence. Anyway, thanks for your help everyone!