OK, I went and got the quest just so I could scan through this. It is all pretty tight right now, at least as far as I have gone. Added actual mob names and such.
I put Main Hand and Offhand in |itemchoiceclasses= but have not seen the quest yet so am not 100% sure that is right. Does the item name actually have (Offhand) on it?