Good luck.
I have been looking for good service shops across the US that come recommended so we can establish a network for the Revolution, and the best come heavily recommended, and they are few and far between...
I don't know if they service anything they didn't sell, but "Tige Watersport" in Corona came as highly recommended as anyone to us. Chris Ainsworth, the owner will definitely take care of you in any case if you mention you are on the forums.
Their number is...
909-737-9801
Best of luck!