New kick-and-cancel injection system for Diamond-II