I totally agree.
Right now I'm on a new project with a teammate who likes to rebase PR branches, and merge with merge commits to "record a clean history of development". It's not quite compatible with the atomic-change philosophy of conventional commits. I'm thinking about making a case to change style, but I've already failed to argue the problem of disruption when rebasing PR branches.
Yeah, I've had similar anxiety recently choosing a new place for my family to live. I think keep in mind that if both choices seem like good options you're likely to get some good outcomes either way. My wife put it like this,