I also feel that this deal is hasty and perhaps not good for India in the long run.
However, if it allows India to have separate nuclear weapons facilities, does that still not allow India to have the nuclear option? Why the need to be a non-nuclear state? If anything, India is more responsible compared to say US itself when it comes to restraint... so why not be a responsible nuclear nation - especially when surrounded by rogue nuclear nation(s).