Right,
My '91 mk2 has a dodgy/worn lock barrel on the drivers side. I have a set of 2 keys but only one works on the door, ignition and boot. The spare only works on the ignition and boot (delocked passenger door) NOT the door which I didnt realise until now... All was fine until the one key that worked on all the locks snapped at the base (was a flip key conversion done by previous owner and was a bit flimsy!) so now im left with one and a half keys

and can't lock/unlock my car easily - it can be done with the broken key but needs a bit of wiggling and something to grip it to turn it
So I bought a blank key and went and got it cut to the same profile as the broken one thinking it would solve the problem but it only works on the ignition and boot the same as the spare does!! I noticed the snapped key was quite badly worn so I got the bloke to file off the newly cut key a bit to make it more like the snapped one which still made no difference
SOOOOO..... advice please chaps. (There is no passenger lock which is a pain, otherwise id just do a quick switcheroo)
1) I thought about swapping the boot lock and door lock as I have central locking so wouldnt matter not being able to operate the boot independantly but after a bit of reading I understand they are different?
2) Get a door lock from a scrappy or dealer but live with having 2 different keys - new one for door/old one for ignition and boot?
3) Get all the locks and ignition from a scrappy and swap em all over (how hard is it to do the ignition barrel?! Done a mini before but I suspect mk2s are a tad more sophisticated?? Or not?!

)
4) I've read its possible to get a barrel from a scrappy and somehow change it to fit my key - anyone got a 'how to' or more info?!
5) File down the new key some more and hope it eventually works
6) Just give up & leave it unlocked
Cheers guys