As much as you say that, you've been driving a rather nice loaner and they paid for a decent rental for your vacation. While you do have good reason to be PO'd. it sounds like someone is taking good care of you.
Good luck. I'd go the lemon law route if it comes on again.