Good morning Hun,
I agree, and if you feel he was ready for 2/1 transition, then I don't think there a need for a permanent change his routine, as it looks good, and you may be fixing what isn't broken. All of the developmental issues are bang on time for the 18 month regression, it really is quite typical. Because of the NW last night, I wonder if OT is now setting in. You could consider bringing BT forward on short nap days, what do you think
Is he likely to 'tack on' if you do this or EW from past experience
As you say his A time has gone from 5 to 6 hours before nap, I wonder if an earlier nap would be achievable which would be the other option and may give you a longer one, especially if the NW set in.
As I'm sure you will remember from the 1 year SR, it really can be a matter of taking one day at a time, depending on night length, NW and using your 'Mother's Instinct' as to what is best from his mood and behaviour that particular day. WRT to teething, are you medicating before his nap
You could also try elevating his head with a pillow underneath his mattress, which can aid rest, due to preventing the blood 'pooling' around his teeth and causing pressure, this helped our DS quite a lot during teething and also 'ear infections'.
One more thing I did with DS was car naps and pushchair naps when possible as he would often sleep longer. Sometimes it was just a matter of a 10 minute walk until he dropped off then bringing him home and inside the house to finish his nap. I would add, try not to worry about APOP (if necessary) during these regressions when your LO is already an IS, as they can always go back to how things were once through the regression. Just do what you can to achieve the maximum amount of sleep day to day.
Let me know your further thoughts Hun
x.