I think separate PRs is ok as you say; I do feel strongly about not squashing all together, because Github should be something that adds on top of git imho, not restrict it, unless there's something that it is always or often broken.