Also the working on PRs workflow seems broken - the local branch doesn't have the changes that are on the PR so I can't pick it up and continue working on it.

Agreed that worktrees seem clearly better.