I don't know if there is a bug in this quest, but I've tried all of the above, and I still cannot kill Diago. I even logged off last night and logged back in today, and when I went back, the Jedi still was fighting Diago. Any suggestions? Should I abandon and start over, as it appears that I'm not really going to get anywhere. Thanks!