Yeah I will use xbow for first option (and have been), I just want to be able to do well with a 2h. I've been hitting shots with my armor that I'm going to be using with 60 WPF in xbow, and now at 100 I'm not having any issues. Maybe sniping on a strat battle is another story, but I think now I'm going to shoot for 130 2h wpf, and 120 xbow wpf.
And I think 18/21 is a better build, but that's just me and on paper. I'm not ever going back to 15 str if I can avoid it.