You might want to add the Welbourne Labs PSU to your list. I have this on my Squeezebox Duet and it works incredibly well.
http://www.welbornelabs.com/cat/squeezeboxpowersupplyupgrades.htm
http://www.welbornelabs.com/cat/squeezeboxpowersupplyupgrades.htm