Quick suggestion regarding the UPS bit; If you can, try to test the UPS with full load of your system. What the numbers indicate and what UPS can actually handle are two different things. Another thing to keep in mind is battery deterioration i.e. a new UPS might be able to a handle a system...