Did you sync back to RB? Normally when you sync, it should keep your beatgrids.
You can analyze with only Phrase
enabled and that should create the waveforms if they are missing.
You can always restore a RB database backup, see Backups and how to restore them but it doesn’t contain your beatgrids because they are stored separately and would make the backup quite big.