I agree with your analysis. That could be exactly what Jim is setting up.
On another, darker subject, Thomas has to feed. In his condition he might even be dangerous to a creature that more or less shrugs off his feeding, like a swartalf. Plus, at the moment there aren't any swartalves that would want to do Thomas any favors. Who does that leave? A female bigfoot? I'm not seeing that happening. How about a Titan? I suppose after she was subdued, but even with Thomas doing his incubus thing, that has a real creepy rape element to it.
I tried thinking about how taking up the Sword of Faith might alter things but I think Thomas has to physically heal first, and that requires that he has to feed.