Bismillah I didn't read entire thread sister and also I am not a alima and so I don't want to say something out of ignorance. At least i haven'd come across that repeating surahs or certain ayats in a nafil salah is not permissible. Lets hope some scholars confirm this. Sorry i was not of much help to you.