Progress on RCS eRHIC Injector Design