Take your 17-40L and place it on the 60D. Nice, instant midrange zoom. Price zero.
Nothing wrong with the YN 560, get some wireless triggers and learn off camera flash. Get some cheap modifiers like an umbrella and go shoot some portraits.
Have you got a decent tripod? You're gonna need one with if you're doing landscapes.