You need a spigot bearing and plate as you mentioned. Manuals are indeed different to auto.

There are tabs/mounts? on each side of the motor that bolt to block and to gearbox, they are different from manual to auto on AE82 but not sure for 20v.