Good news, I am at least back to the low rpm stutter I had before with no CELs! While I wait for a new MAF to arrive, I thought I'd clean the throttle body. When taking it off, I noticed that one of the rubbers holding the plenum in place had moved and was allowing air to bypass the entire intake.
With that fixed, the car is drivable again and hopefully with a new MAF, better than new
Sam