Yeah, I took that route as well.
I found a dual USB (1 power, 1 data) like this to feed my c. 2015 Display Audio I dropped in to preserve the aesthetics.
But like OP, I’m looking to fix the broken 12v power socket plus I want a USB-PD Type C to round out my power choices. Plus the pocket flipping cover won’t stay shut. This kit seem like just the ticket.