I really doubt MVDP will contest the final week as at max in my view he will drop out at the second rest day to head to Tokyo to acclimatise for the Olympics.
Olympic athletes have defined time limits in which they can land in Japan for the Olympics - They can't just rock up 2 or 3 weeks before their event.