Workaround for me was moving the ~/Library/Mail folder out to the Desktop and letting Mail remake the folder. Be aware, I'm not sure how destructive this is to attachments, settings and mbox contents, but it has let me load Mail to poke around for now and all Mail is being shown and searched with the same layout I had used previously.