When things warp you do still have options. The bees don’t care so any adjustments are for you. I think the nuc/bait hive is a good idea, but if you want to keep the original hive here are a couple of ideas.
Followers are too tight then shave them down to match the hive.
Followers too lose then add some material around the edge to tighten them up.