Warranty work- time in shop , add it to warranty peroid ?

You should take it up with the maker and ask them to arrange for someone else to repair it since the current dealer is incompetent. There is no way it should take them that long to do repairs unless the maker is the hold up, which in turn makes the case for your request for extended warranty time.