While at Staples I stumbled upon this power supply Antec EarthWatts 500W continuous power supply.
It is the same wattage as the stock ToM supply weights at least twice as much. It has the same form factor.
Now my motors do not whine, the lights do not blink, the temperatures remain +/- 1°C, and the prints are better.
Staples wants $99 for this unit and I have not looked elsewhere to see if there any less expensive ones available.
May this will be of help to someone else with supply issues.