AAD devices - Switch to Corporate - Join intune

Hello,

we have a fleet of computers joined in AAD. 

They are automatically marked as personal according to the MS documentation.

Now even if we add the machined hash to intune, the status of the device in AAD do not change.

In our intune setup we block Personal device to join. 

Now we are in a loop where existing machines in AAD cannot be joined in intune because automatically tagged as personal.

Is there anyway to convert those machine in Corporate?

I think we have 2 solutions: 

1 : import hardware hashes, remove the machine from AAD and rejoin.

Or 

2: Allow personal machines to join intune and change ownership after.

Any other idea? Are my solution valid?