I'm reminded of that saying about doing the same thing over and over and expecting different results. They screwed you around on a previous bike, so it's not surprising the same dealership would do it again. This sort of thing tends to be part of the culture of the particular business. In other words, it happens where the dealer/manager allows this crap to happen, and it doesn't happen where the owner/manager does not tolerate BS from employee's.
Anyhow, if all you do is talk to the clueless service advisor you won't get satisfaction. Take Twolanerider's advice and move up the food chain to the top dog. If his or her attitude is similar to the dweebs in the service department, you have found the real problem. If you then continue to do business with this place, don't be surprised when you get crappy service.
Not trying to be an ass, but sugar coating it isn't going to help either.
Jerry