Nice progress!
That looks like a lot of work, but I understand it's because you need the extra precision in timing.
Keep up the good work! :D