Hi Gregory,
yes, I suggest you to decrease the maxbatchcount as described in the note.
Mass conflict resolution: you are welcome ;-)
Regarding the "hanging" cbs state, you can try this approach:
http://wiki.scn.sap.com/wiki/pages/viewpage.action?pageId=247137217
Regards,
Ervin