I found another dealer - much more responsive, they ordered the parts for me in advance and will get me in after 3 other (practrice) police FJR's. So in about 2 weeks...Bastards - find another shop.
I would also report them to Yamaha head office. They should be bending over backwards to resolve this issue.
Not bending you over.
Canadian FJR