Using a non-dealer does not void the warranty. There is a law regarding this (can't remember the name). One place I know of that does great work on all kinds of exotics is idc on Aviation Boulevard in Redondo Beach. They might be listed as "International Dream Cars", but the sign out front says "idc". Don't have the number handy, but I have it at work. PM me if you want specifics.