guru...you need to up the size of the heatinks for the output devices on the amp and also on the S22 power supply..only just noticed them now. Monitor the temperature on the heatsinks and it might be a good idea to either run the amp off of a un-interrupted power supply to avoid risking blowing the output devices when you get those power cuts
. And I highly recommend it in your case as you have the locking headphone jack (hate those)
You will need to use these ones
One other tweak would be to shunt the potentiometer using some takman or riken resistors depending on the value of your potentiometer. Use anywhere from 40-47k resistors for shunt modding it if its a plain ALPS blue velvet 50k pot.