You're charging your batteries as nicad instead of NiMh?! When you've charged them in the past did the battery get very hot? If so you've likely overcharged the batteries which will damage the batteries.
If not, then they probably always been undercharged which of course would explain the very short run times. It might be worth cycling the batteries, charging them (correctly this time, as nimh

) then discharging them. Do this 2-3 times then fully charge them and see how your run times look. It's worth a shot, but probably best to replace them with a new pack.
If you do go lipo in the future I'd HIGHLY recommend the Hyperion EOS 0606i charge, I have used this for the last year or so and this charger is top notch! Will charge just about everything under the sun including LiFe battery packs.
-Michael