You mentioned it in your OP, and it hasn't gotten much follow-up discussion, but since you mentioned "guitar solos," and since you really seem to like DT's piano ballads, I'd very highly recommend listing to Vacant/Stream of Consciousness off of their Train of Thought album. From what you've said you've liked so far, I'm not sure the rest of the album would be up your alley, but these two songs go together and use the same melody.
Stream of Consciousness is an instrumental, but it's pretty focused and riff-based. And it has, IMO, the most jaw-dropping guitar solo in a catalog of jaw-dropping guitar solos. Vacant is kind of the prequel to Stream of Consciousness, and is piano, cello? and vocals only. If you liked Wait for Sleep and Far from Heaven, I think you would like this one.