Finally got around to having my gear box swapped out with a donor box at the end of last month :)
She's silky smooth now and shifts like it should, fingers crossed I never have to experience the 3rd & 4th crunch again!
Had plans to have the front cross member grinded back, repainted and wax...