Messages and FaceTime stuck with temporary number
I managed to fix this by switching off Messages and FaceTime, removing the SIM, turning off, switching back on, reinserting the SIM and then manually tweaking the Apple Account contacts (removing the manually added number, which was a duplicate once the reinserted SIM was recognised).

I don’t know which of the above steps are necessary and which are optional, but it seems to have worked for me!