I know it's been a PITA but it seem to be working out for you.

I hope you get your replacement soon.