Well thats a lot of drama alright. I would never let a dealer replace my SM ever...... been there and backed out. Glad it was not a SM problem after all.
As a note.... your GDE tune should cancel out the swirl motor.... You could email them with your VIN number and purchase date etc to confirm. There have been different versions of the tune.
2007 WK 3.0L CRD, Quadradrive II, GDE EcoTune, DPF-Delete
4xGuard Front, Rear, Belly, & Side Rails, Factory Skids
EHM MOD, Garmin Mechanic EcoHD, K&N Filter (Deleted)