Just a quick update. Its been 3 weeks now since I cleaned the MAF with CRC Sensor Cleaner, and I have had no problems whatsoever. I have driven about 3 -4k km since that time, so I feel pretty confident in saying that the issue is resolved.

Still getting oil in the system, but thats a separate issue.