I’m glad it’s working for you. Though this is not an ideal fix, it at least works for now. You were correct in your title in that this is a bug with permalinks. And you are correct that this could be an issue in the future when upgrading. I created a ticket, so hopefully this will be fixed in the future for yourself and other users.
