I was talking to Bruce & Kerry at lunch time (ran into them at the coffee shop).

I mentioned your wanting to upgrade from the Terry, and they thought the Terry was an excellent bike, but some of the mechanicals are dated. Which seems to correspond with your feelings. Bruce suggested they could be upgraded easily, which would give you the continued use of your beloved frame, with all the spiffy features of new bikes.