RX1 going back

I should have know the AF would disappoint. I've briefly owned the Fuji X100, NEX-7, and tried a friend's RX100. All have excellent image quality and outstanding features, but the one thing they all lack is an AF to keep up with toddlers. I was hoping the RX1 would be the one to replace my DSLRs, but the gap between CF and PDAF is too great. Maybe the OM-D? Or maybe wait until CF progresses in the next NEX iteration(s) or the RX2.