I can't blame you for getting mad. Two months is way too long. I would not go for a trade up either. Hope the factory can find the problem and fix it. I would have been asking for a loaner a long time ago. After that length of time I would have been having withdrawal symptoms.
Sue