Manali is my all time favorite and you selected a great spot .Take a Volvo, its very comfortable.I would also suggest you to do a Manikaran.
Then if you want to taste a bit of Trekking. Come to Dharmashala Mcleodganj and trek to Triund and night halt in a camp. its awsum.