OP, I see you have trimmed your original somewhat ambitious itinerary and that sounds like a good call.
One thing I would recommend heartily is to use a CC with supplemental rental insurance (I always use Amex). Particularly with one-way/dropoff rentals, IME the checkin person can be particularly zealous about noting "damage" all over the car. We never hit or scraped anything and the Avis guy at GVA "found" CHF 900 in damage. I put in a claim with Amex and it magically disappeared.