On crop either the 17-55 IS, 15-85 IS (if you don't need the speed - the IS is very good) or Tamron 17-50 non VC are the recommended ones. Buy any of these and you will sell them very easily if you move completely to FF.
Personally, I think 24mm is too long on crop, but I tend to shoot wide. We have the 15-85 IS on the 7D and the 15-24mm is probably the most often used. 85mm is the next most often used length.
If you only have 2 lenses. On crop: one of the 3 above + 70-200 L (which ever you can afford with your budget). On FF my choice would be 17-40L and 24-105L if f4 is OK for you....