I luckily fix this same issue w/o losing my data.
I just had this same issue, it wouldn't repair past 67% with a black screen in safe mode. After about a hour of letting it sit.
I unplugged the PS5, rebooted back into safe mode. And Chose the option to "clear the catch /rebuild database"...