I called CGW this morning and got it all sorted, had to file the tiniest bit of an edge off the flat part of the manual safety shaft, also took care of that grit in the hammer cocking as apparently the sear was rubbing weird against the manual safety shaft while cocking.
I always heard CGW was awesome, but now I've confirmed it myself, those guys rock!