I had the same problem exactly. For me changing the disconnector solved the problem but you already swapped yours. Have you looked at the sear itself? If the disconnector was worn then the sear might be as well, or the sear engagement notch on the hammer. If you opt to replace the sear just remember that there are two different sears depending on if you have an old or new model and ther are NOT interchangeable.