If hockey is really important to you(since it's even in your name) I would suggest the following:

- Better camera body: A 60D or 7D is nice, but it costs quite a bit. A (second hand) 50D is what I would be looking at. You could even take video with it if you want with the latest magic lantern software. If video is a more important feature to you, go for a 60D/7D.
- Better lens: go for a Canon 70-200 in either F4 or F2.8 with or without IS. You won't regret it a single second. If the hockey(ice??)field is the same size as the figure skating field. You're all set with a good 70-200. Perfect lens for it. It's also perfect for hiking, holidays, landscapes etc.

If your priorities are more holiday/hiking orientated I would suggest a better general lens(random order, they are all good + better than your 17-85):
- Canon 17-55 f2.8 IS USM
- Canon 24-105 F4L IS USM
- Canon 24-70 F2.8L USM
- Canon 17-40 F4L USM
- Tamron 17-50 F2.8 (VC or non VC)

The Tamron is the cheapest compared to the others, but definitely delivers great image-quality. It has the best price/quality as far as I'm concerned.

Good luck. And remember that when upgrading your camera you would also need CF-cards.

-Jan-