It's a corp machine, and we're the IT department, and my boss has already said that if it happens for a third time, he's going to tell our rep to swap it out for an 18 SKU with the butterfly v3.

My understanding is that the best they can upgrade you to is if you're on the v1 keyboard is the v2, as the battery shaping on the v3 bottom case doesn't align with the 2017 logic board, so they can't actually upgrade you to the keyboard with the rubber crumb condom.