In the end, I decided for Aclonica, as I think it is truest to the previous and also quite readable. I have uploaded updated source and binary packages too, with bugfixes.
Joe, if you could try and see if the flickering is gone, that would be great. Just note that based on feedback from the Debian package maintainer, it will start up in window mode by default, so you may have to switch to letterbox in order to check. Though in your case, it should pick up the configuration that is already in place and start in the same mode as the previous version.
Now, barring any other major or minor issues, I really only need to finish documentation, wait on translation updates and then package up for final release. But first of all, I'll move the code over to git, now that there shouldn't be many changes required.
Anyway, please test, and report back what you find. Especially curious about multi-monitor setups and video mode switching. If somebody has a Mac with Retina display, checking if that is properly supported would also be nice.