Hallo Michael,
If I were you, I would run the SWPM from scratch and make it to create the needed parts... Since you have already run SWPM until restore step, it makes sense to me to use SWPM for all process.
Just start SWPM with a new installation option. I guess it won't take too long.
Regards,
Serhat