I guess I'll play around with the trial first and see if I actually like it more than Lightroom, which I've gotten to know a bit from playing around with the Pentax.
The 40D arrived today, by the way. DigitalRev did a nice job on the packaging, and the included "gift pack" is quite nice - camera bag, card holder, cleaning kit, cloth, LCD protector film, and a total of three different camera straps (aside from one from Canon) plus I got the extra battery and 2GB flash card as part of the deal. Nice sturdy bag too. Not a bad deal at all! Now I just need to get myself a lens, but I'm going to leave that until payday - self torture, I know!