It's good to hear your getting some resolution with this.
Just out of being nosey who are the repair house your using ?
Are they an authorised Samsung Repair Centre @Julie84 ?
Daily Driver > Samsung Galaxy s²² Ultra 256Gb in Phantom Black.
The advice I offer is my own and does not represent Samsung’s position.
I'm here to help.