The implementation above is "millis() proof".

I also don't have a huge amount of confidence in any edge-interrupt based solutions. It is so easy to miss an edge..