Right now there are no all-in-one replacements, you'd need to make your own custom PCB with a PD controller and USB MUX. Better to just wait on a restock, Gunnar recently moved so that's likely been the hold up. Hopefully not too long before a restock, definitely worth the wait.