Travel insurance suggestions

I'm heading off on a freeride skiing holiday to Japan next month for two weeks.

I'm looking for tips on taking out travel insurance and recommendations of good providers.

My two key considerations are:

1) I would like to be reimbursed for flights/accommodation in case of trip cancellation due to illness (including Covid) or accident.

2) Freeriding is an inherently risky activity, so I want to ensure that I'm well covered as far as search and rescue, medical, and repatriation costs are concerned.

With regards to point 2), I have the mandatory accident insurance provided by my employer and I pay a Rega patronage - I understand that both of these will cover me to some degree.

Thanks for your help!