complete the cross-midnight logic for ToD rules

my prior patch did not cover half of the cross-midnight case because it didn't take into account that ControlPlane's "now" moves over midnight itself...

also simplifies the match-logic removing unnecessary object conversions