Mk1 bam shifter

Recently converted my mk1 to a bam engine with o2j, early mk4 5 speed.
Gear stick moves to far, hand catches dash.

Short shifter help?

Think it's the mk4 gti shift tower.

Standard gear lever is mega long

Any ideas