[Rich_D]

Might be worth replacing the glow plug controller to eliminate that, for the N57 you need a Beru GSE108, it can be swapped without removing the inlet manifold, but it's fiddly and you'll swear a lot, trust me LOL.

Boost (MAP) sensor is front right of the engine when you remove the cover, on top of the inlet manifold, 1 bolt holds it in place, pop it out & clean carefully. I used a plastic scraper and then carb cleaner spray, don't poke anything too far down the hole, mine was partially blocked with carbon crap. Whether or not this is causing your issues is unknown, but it can't hurt.

Even though the EGR is mapped out, is it still physically in place? Could it still do something during a regen even though it's not used under normal driving? As you say same kind of symptoms with the hesitation & stuttering, maybe worth asking who mapped it.