one possibility I am mulling over I giving the inquisitor an electrostaff rather then a dual blade lightsaber; no one is really melee oriented atm,so its less of an issue if it falls into their hands. Sure they could train to use it, but that takes time and I would be fine with that.
failing that, I am currently planning to have the final confrontation on a repurposed gas mining station, shades of Bespin? Should provide plenty of long drops and dangerous machinery to provide dramatic fall to peoples deaths if I choose to go down that route