I'm going to get rid of the ups and m.2 is not compability with my parts. I have already changed the power supply just like you suggest.
Excellent work on the build and the cable management.
I will okay.
The optical drive will be for ripping movies and some other stuff. I will change the power supply like you suggested and I will get the m.2 SSD if it is compability with my parts.