Upgrading 2018 picade

Hello, I’m looking to upgrade my 2018 picade - the PCB on my original is starting to give me a few issues. I ordered the picade x hat but hadn’t realised that the wiring for the original joystick is different from the new version. Can anyone tell me if the mounting on the original 2018 joystick (with red top) is the same as the mounting on the current joystick, i.e. this one - Joystick - Pimoroni
Basically I want to know if I can order one of these and if the original mounting holes will fit.
Also, can anyone think of any other gotchas on upgrading from the 2018 to using the picade x hat? The original one also didn’t have a power button so not sure if this will also be an issue. Thanks!