I commend you for making them somewhat stick to their warranty rather then buying their way out of it. Yes $2100 would buy you a decent machine, but there's a principle here that's beyond money, and I'm glad to see you are aware of that.
Aww man, don't hold me to any big principles. I'm just flipping coins.