Oh, sweet! My first let's play! You are the man!
You can definitely kill the captive and see him(!) in the ghost room instead of the warlock. You actually did the less violent choice in both the beginning and the end.
Looks like Bankenstein and some of the controls gave you a hard time. Sorry about that! Also, x-box controllers should work!