Issues with Azure AD Joined devices Autopilot registered to administrator not user

Have tried Windows Autopilot the last months and got it functioning mostly the way I want it to work.

However - one thing does bother me. When you set up a new laptop-device, first it creates a computer object in Azure that is "Azure AD Joined", during the hybrid join to the domain it creates another "real" object that is "Hybrid Azure AD Joined" which looks like the "real" computer object.

When I change the primary user in Intune - the "real" object will be released from my "device limit" and away from my devices. However the first "Azure AD Joined" device object is left with me.

It's not even possible to delete the object since it's an Autopilot object. This will be a problem since there is a 15 device limit to every user. What is the best practice to get around this?

I want the primary user to have both objects under that user and nothing to do with me as just an administrator that registered the hardware hash to Autopilot.