i think it's a good call keeping the squat in there. it's perfect exercise. hits everything. good for hip and ankle mobility which is perfect for running and riding.
Good to know I'm not the only one thinking that. The mini sets are pretty fun, after the squats my heart rate is up and I'm breathing hard.