Well your list is decent. You are right that you can take two nsf

however most people do it to maximize the amount of ndk(4).
Some things I do while making a list.
Always put atleast one hammer in a terminal squad and a psy canon. With the new
FAQ halberds got a lot better due to not being to Able to cast force and hammerhand without a Libby.
Towards the list I think you have to much Libbie's and to many interceptors I would run atleast draigo or
GM so you have melee hero, I would add more ndk on 2000 pts. I also like liber dominca book the armour as relic. With your current tactic you are not using the nsf alpha strike (turn 1 in your face deep strike) so better take cad. Further more I prefer to run to more terminators.
When I count your point I come to 1878 did you forget to typ something?
There is also a Tatica thread in tactics section. Just my thoughts