Can your trainer adapt your training plan to accommodate the 600k rando? Seems like with 5-6 weeks to work with, that would be a reasonable request.

I agree that you should go towards your goals.