Did you listen to People and Things or Glass Passenger? His whinyness ended a long time ago. You can notice it a lot in People and Things.
the b-sides from People and Things (i.e. the In Transit and Glass Passenger demos) were some of his best releases because he still had that 'whine'