I know it's a late response, but I recently had a similar issue with lack of power/surging as described above.
Ended up cleaning the (very dirty)
MAF with electrical contact cleaner spray on the visible sensor part which gave a small improvement. I then pulled the
MAF off again and sprayed it up inside tube this time. A lot of dirt flowed out and I haven't had an issue since - the cars returned it's best again.
Just thoughts for anyone finding this thread in the future.