I've been looking into upgrading to the 10d - they're getting cheaper over here (under £800 new) so might take the plunge before too long.
If it was me i'd go for the 10D and the lighting gear but i'd add summut like a 50mm f1.8 for portrait work (dead cheap too)
tried the 20d the other day, very nice indeed