At this point, with your warranty running out, I’d dig in with the dealership and ask them escalate your case. Worse case scenario, at least all this was fully documented before the warranty expired. Good luck, hope it resolves positively in your favor.