Finally got the right 4gl gearbox oil and now the gearshift is so smooth. Although a lot quieter the harsh whining noise is still there in the cluster (1st, 2nd 3rd and 5th). 4th is almost silent so I'm just gunna turn up the radio and pretend all is good.