Hello Perinchery,
High idle and hard gear shift at the same time indicates a likely "false air" problem of the intake manifold. Under this condition the modulator valve is applied with a lower vacuum, believing the engine is under a higher load thus performing a harder gear shift.
All the best and good luck.
Dokta