Colombia Itinerary roughly 24 days

Hey!

I'm wondering if anyone can provide some feedback/advice or indeed any suggestions as to things we may be missing or things we can omit from the below. Things we're interested in: local culture, beaches, nightlife, sport (we are both 29 and have traveled some). We arrive in Bogota on 16th September in the morning (we've arriving from SF USA so shouldn't be jet lagged). We will be busing it as much as possible and are fine with long bus journeys. We also don't mind traveling at a reasonable pace in order to see more...

We have a tour booked for the inca trail on 27th Nov so definitely need to be in Lima for then. We have roughly 5 weeks to get there from Bogotá and have dedicated around 24 days for Colombia (& 10 days Ecuador) based on quote a lot of searching the forums here and elsewhere have come up with a list of places that are a possibility:

16th Sep Arrive Bogota
Zipaquira
Villa De Leyva
San Gil
Tayrona
Santa Marta
Cartagena
Medellin
Jardin
Manizales
Salento
Cali
Popayán

Then leave colombia to quito I assume by bus...

Thanks in advance!