Product form display isn't using product variation form it is assigned to.

This is a little convoluted but hopefully will make sense. Also, i am not 100% sure where the Duplicate action comes from on Product types; that may be partially to blame here; but not 100% of the bug as some is a core commerce issue.

I have a Product type (and match variation type) called Riders. I wanted to change this to the semantically correct Rider (no "s"). I used the Duplicate function for the Product and allowed it to create a new variation as well (Rider). So i now have both Rider and Riders, product type and product variation type:

pr type machine variation
Rider rider Rider
Riders riders Riders

but, when i go to add a Rider product, the variation form is using the form display settings for Riders; not Rider as it should be.

Hard to wrap my head around how this could be happening; but i would have to assume that something in the duplication of the product incorrectly links to the variation; even though it isn't set to be using that variation.