Fez to Marrakesh

Hi

I'm looking for advice regarding places to see and the best itinary travelling between Fez and Marrakesh.

I'm going to Morocco for just over a week in June, arriving in Fez the morning of Saturday 9th June and flying out of Marrakesh the morning of Sunday 17th June.

I want to spend a couple of days in each of these cities but am stuck on how best to use my remaining time.

My original plan was

2 days in fez
a day trip to meknes then an overnight train to marrakesh
2 days in marrakesh
2-2.5 days on a trip to climb Jebel Toubkal
remaining time back in marrakesh

Does anyone have any alternative suggestions for must see places (eg on the way between Fez and Marrakesh) or that they would suggest instead on the time spent for Jebel Toubkal (eg Dades or todra Valleys) that they think would be a better use of my time?

I'd really like to travel through one of the spectacular high mountain passes but don't know how feasible that is with the above itinary.

Also if anyone has any specific comments on how feasible it is (and how much it costs) to climb Jebel Toubkal on a 2-2.5 day trip from Marrakesh that would be really helpful.

I'm travelling by myself and preferably want to use public transport wherever possible. I'm reasonably flexible on budget but would prefer not to spend too much.

I'm not into beaches so amn't fussed about visiting Essaouria.

Thanks for your help

Ash