Everything in your diagram looks correct. The reason you are probably getting the short is because none of the ends of the wire leads can stick out .. if there is some of it sticking out it will cause the short. On Protanks and Evods it is simple to get the wire to be flush with the screw, with none of it protruding. Here's a trick for doing that .. what you do is first put the screw in so everything is held in tight .. the ends of your wires will be sticking out ... now wiggle the wire back and forth, wiggle it snuggly against the screw and it will break off. It will break flush to the screw, so now none of it will be protruding. When it is done that way there won't be a short.