The next obvious upgrade is to make the pi-400 headless, right? Why have wires at all? It should have a rechargeable battery like most keyboard/mouse combos do.

Then you just plug it in to charge it and every other perf connects via bluetooth or wifi.