Your logic isn’t bad. For a MV plan I’d recommend substituting your weekly crit for one of the interval days (Tues, Thurs, or Sat), and substitute your group ride for Sundays’ workout. More discussion below and also use the search function on the forum to find similar topics.