You had 2x next to one on your list! Never mind.
I'm all for retrofit, but wouldn't this be a much easier OEM option while keeping the 12V port? Or just any adapter from Amazon...
View attachment 163097
View attachment 163098
The 12V adaptor is a cleaner option as you can get dual USB-C / USB-A version for around a tenner. Other point is that the voltage will always be supplied to the 12/5V converter on the pins when running, whereas the adaptor uses non when not in use, as it will be on either a low power mode or removed from the socket