The new calendar feature kills the current training plan?

I am in the erratic schedule boat too and just want to do the next workout in the plan when I can. The old version of the Android app was perfect. Has this been fixed? I can’t find a setting adjustment to get away from the candler option. The current way is really really annoying.