Can anybody please advise - Ninety/One Ten petrol v diesel ignition switch

My 90 with a V8 was a 2.5 petrol yet has a 2.5 NA/TD ignition switch (PRC2735) which has broken.
The switch is wired as in the photo:

Are the terminal numbers and actions the same on all switches? If I use a petrol/Tdi switch PRC8230 or Lucas 579085 Petrol Series 3 90/110 1989 Model Year/200TDI as below do I wire it the same? The labelling on the photo below is from the Haynes Manual!

Many thanks for any replies and advice.

Looking at 579085 I see the barrel insert is not from the back as in the PRC2735.

Probably best to use what I've got already as the wiring has been sorted to accomodate.

Before I go for the PRC2735 anybody any thoughts about the PRC8230? Fit, wiring, function?

Get the Tdi 1.this allows for the glow plugs on the ignition barrel.
Get a full kit as some of the inners won’t swap over.

The 90 is petrol so doesn't need a glow plug feed.
I know the NA/TD switch works but want to know if I can use a petrol switch; my accs come on with ignition an I rather have them separate.

They've not got the petrol switch in stock but I can have the diesel one by tomorrow so going for that as it what's there ready and it works.
Thanks all.

A public thank you to MPS4x4 https://www.ebay.co.uk/str/mpstradinglandroverparts I've used them in the past but this is ace!

Just had a call, they have the ignition switch in stock and I can collect it today. I replied that it'll have to be tomorrow now as I have to collect my granddaughter from nursery in an hour or so.

They replied, "I live in XXXXXXX just down the road from you...I can bring it home and you can collect it from my house today after 5, is that ok?"

I couldn't say thank you enough! I was very impressed, not just their helpfulness but the fact that they gave a customer their private address to help them out of a fix.

Good to see some suppliers going out the way to ensure happiness..

New switch in and working correctly