Have u checked the plastic bush on the bottom of the gear shifter to see if it's broken?
Remove the gear stick and check it just incase or just do it when u do ur clutch and oil.
Might be adding to ur shifting dramas..
Good luck dude.