If circle time is the only thing that doesn't seem to work for him AND he appears to be in the middle of the two options than I would probably just pick him up early.