Apart from my suggestions?
Ahh. They weren't so bad (or were they?).
I maintain the statement about the MoBo and the PSU is for him to decide. A non-modular "should" be better from overall point of view but the tradeoff with a modular PSU in form of able to use only cables he needs may be worth it. Even for slightly higher price.
So Hyxgen, are you or are you not good with cable ties (if you are - non-modular PSU, if not - modular PSU, so you can have a tidy case with unrestricted airflow).
Also make sure you use cash back (TopCashback) and Flubit (for Amazon only purchases). You could save a good 5% to 15% (enough for a 120/128GB SSD).