I mentioned that because I could not oversee the consequences of the combination of the two t0's you've computed and all variations of the general formula you've used in the first solution (maybe one quadrant ran backwards for all I knew) I didn't check that.
But you can check that yourself. If the starting points in all quadrants give correct results, if small additions in the starting position (1 degree, say) give the same difference in the future point, and if the connections are continuous (so at both sides of the point when Y of the startingpoint flips sign) then your solution works.
You can also try to reason why using the polarity works by writing down examples for all quadrants and see what the computation of t0 yields, looking at the range of acos(). Then it should be easy to see why the polarity works (if indeed it does, I didn't check it).