David, I missed your additional photo's the last time - that's pretty clever as far as the mechanical keyboard stacking, must have been a bit of work...
What's your aim on the power supply? To replace both with a common source or fix a broken one? You obviously can leave out all the related power amp...