I would scrap Venice for Florence. There is so much art to see in Florence (get the Firenze pass to skip the lines). (There's both a Westin and a St. Regis not too far from the main sights in Florence.) But if art isn't your thing, then keep the schedule as is. Venice is IMHO meh.
So far, I think the collective wisdom has scrapped your entire trip.