It really depends on your priorities. If you want to have video capability, then the
EOS 7D is the obvious route.
However you have no real wideangle capability, so if you want that and you're limited to spending $1700, then the
refurbished 50D and the 10-22 is the obvious route. An alternative would be to look for a refurbished 5D, and then your 24-105 will give you decent wideangle capability (though not as wide as the 10-22 on a 50D). You can get a
5D refub from Adorama for $1799.75 If you want both video and wideangle then you might consider the Rebel T1i. It has 720p HD video and a 15MP sensor equivalent to that of the 50D (my review is at
http://www.bobatkins.com/photography/digital/canon_digital_rebel_T1i_review_1.html).
Though it's "only" a Rebel, it might give you the best of both worlds and you can get both a
Rebel T1i and an
EF-S 10-22 for around $1360
A point to note is that the 7D uses a different battery from the 20D and 30D, so you'd need to take the charger and maybe get a spare battery or two. The T1i also uses a different battery from the 20D and 30D and needs SD cards for storage (though you can get 8GB SDHC cards for
under $20). The 50D would give you both battery and memory card compatibility with the 20D/30D