The second gear issue was the same as mine, use to slow change till I hit 3rd but eventually took it to the shop. Back then the upgrade kit was subsidized by Triumph so didn't cost much, so only labor cost then, now its a small fortune unless you can do yourself.
I'm going through a full rebuild...