You could also check to see that nothing is pressing on the gear lever in top gear(carpet, rubber boot or body)
Next, check to see that engine and gear box rubber mounts are in excellent condition and holding everything tight.
Might get lucky and save some drama.