Have you looked at trip insurance? You might want to consider it in case someone in your party tests positive for your trip back and you have to shell out another weeks worth of hotels.
When we booked this late 2021 i REALLY thought things would have settled to the point of "no test travel". Silly me. I did pay more for for flight for this sole reason.
We have family there. That is least of my worries.
And truth be told, im not TERRIBLY sad to spend another week in Switzerland. ;)
My clients that are expecting me back on 5 July will simply have to "deal with it " lol.
We will take precautions, be smart indoors etc. Now im second guessing that train from Geneva to Paris lolol. Ahhhh eff it- YOLO.