which activity fit best for OCR-like training?

I am training in OCR style (shorter runnings, muscle excercises, obstacles, etc like Spartan races)
Till now I used Cardio (it was Garmin's advice) activity. But now I noticed that The Cardio didn't register the running distances, I couldn't see the map anymore neither )maybe since the last update)
The running activitíy is not good for me, because we have a lot of excersices in place, and I don't need the pace. But after that we suddenly change to running... So it not so simple...

Is there any wise advise about this issue?