I stand for delaying 6.1 changes to classes. While NIN won't feel different rotation wise in my opinion, it's interaction with the party changes which is my only concern. Samurai, on the other hand, raises some red flags for me because losing what is considered a part of your identity skill is not something that should be done. That's like removing jumps from Dragoon or mudras from NIN.