Try the firing order I gave you, get the timing at about 10 BTDC, get a new battery, then see if that doesn't fix it. You probably fried a cell or two on the battery when you shorted it. You may just have one or two wires going to the wrong plugs. It wil start and run, but will be shitty.