If you can put it under vacuum for a while after the rotovap, that should remove any traces of SOCl2. I use both oxalyl chloride and thionyl choride, mostly following the prep I have, but I have alternated, and in most cases they both work fine. Oxalyl seems a little gentler to me, but not on everything.