I find the solos on Awaken the Master and Sleeping Giant to be well thought-out. This is probably because, as someone posted above, the riffs underneath those sections are more melodic in nature so it sounds like the solos have more thought put into them. This also makes it far easier for Jordan to come up with melodic ideas -- the framework is already there.
Jordan's issue is not that he can't come up with melodic solos (check Feeding The Wheel and Rhythm Of Time for proof of that,) I think it's that he just hits record, and just plays whatever comes into his head with little thought given beforehand. Nothing at all wrong with improvising solos, in fact I generally prefer it and most bands I listen to nowadays are like this but it just feels as if Jordan is going through the motions on many of these parts.
My enjoyment of a JR solo nowadays is largely dependent on the chord progression that is underneath it; if it's a good one, the solo will probably be good, recycled or not it will automatically sound better. If it's just a basic riff or something, well...can't expect originality over that every time can we?
All of that being said I certainly still prefer his current solos compared to, say, Derek Sherinian's from SoA etc.
My problem nowadays is that since I listen to so much jazz fusion, funk, etc and hearing absolutely outstanding keyboardists in those genres who are constantly crafting masterful solos on the spot, I get tired of a lot of keys solos in prog metal in general. I know it's unfair to compare those genres but man...hearing guys like Cory Henry, Anomalie, Eli Winderman, Shaun Martin, J3PO, Hirotaka Izumi, Caleb McCampbell, Minoru Mukaiya, etc plus some guys I personally play with, changed the game for me and has inspired me 100 times more in my own keys development than JR, no matter how much I still love and respect what he does...just what resonates with me.