You do not need to add night. What you need for CPL is an ICAO PPL with night privalages, which is "built in" with the FAA PPL.
I would say that the night training that I got in the US is not very good. I would consider doing the NQ here to be a better pilot. Also with minimum hours you would not have 5 hours night for the CPL issue.