You can assign the DID to the digital extension, or you can change the extension numbers. Make the analog set a random ext. number, then make the digital set the ext. number that used to be the analog, then make the analog the ext. number that used to be the digital.

Voicemail and DID should follow the extension number unless the original programmer did something tricky.