How do I re-upload 'removed from icloud' tracks?

I have had a bit of a disaster with my itunes/apple music library!

For some reason all my songs appeared twice in itunes on my PC, one had the 'available for download' cloud showing as it's status and the other had 'removed from icloud'. I checked the song info and saw that the ones showing as available for download were the apple music versions and the ones saying removed from icloud were my aac/mp3 local files. I highlighted all the apple music versions and deleted them so all I am left with is the local files.

I think the problem occurred when I added a song to itunes and it wouldn't show on my phone, I switched icloud music library off on my phone to try to get it to update when switched back on.

The problem is I can't find a way to get icloud to match them again, and all the music on my phone is showing but has the download icloud icon next to it so isn't actually stored on the phone.

I have tried going to file > library > update icloud music library, that didn't work, I have tried plugging my phone in and syncing it, that didn't work, I have tried switching icloud music library off, creating a new library, deleting all songs, going back to my original library and switching icloud music library back on, that also didn't work.

Basically I want to go back to how it was before this mess, having the songs on my PC and my phone that I had before subscribing to apple music matched and downloaded to both PC and iphone and if I add any new songs (either local files or apple music) apple music keeping them all in sync.