Yea, they're all a pain simply because of where it's at. But it's not the SWPS. It's something in the calibration.
Did you call a dealership? Or GM customer service?
I would take it in to a GM dealer, you don't need to take it to a Caddy dealer, matter of fact, I would take it to a Chevy one, because they probably faced this the most and are familiar with these exact symptoms. Express that you understand your VIN isn't in the range, but that it's doing exactly what this recall is addressing. If it fixes it, they can work the system to get it fixed under the recall. It's not like parts need to be replaced. It's just connecting a T2 (or now MDI I suppose) between the vehicle and tech terminal and downloading the latest calibration.