After writing this yesterday, I received an update to 5.0.999.760 and was able to easily enroll a headset through the new MDM Setup menu on first try. I named the device how I wanted and did not have to enter the device type in the "Device Name" text field. Glad to see this working now!