Meh, glad to see its "resolved"....
If this does come up again, I wouldn't say cut off the companies modifying them, just require a disclaimer that it will void the manufacturers warranty.
Automotive manufacturers already do this. My Subaru is under factory warranty as long as I use SPT parts from Subaru and dealer installed. If I throw aftermarket exhaust, brakes and coil overs, then I am just just with powertrain coverage. Its clearly stated in my warranty.
I do kind of agree with Red Dawn though. Good timing for mild drama, eh?