No way would I upgrade until they resolve the issue you have now! In fact, they should have already offered to replace the machine IMHO! If my dealer took that long, I would ditch them! But I am spoiled. Have been doing business with the same dealer since 1974 and never had any problems! They are wonderful. I drive 150 miles each way to see them!