Check with your LBS and see if they'll install a longer stem so you can test it with that. I'm not sure how much you've adjusted the fit while testing but there might be a few tweaks that would make the 17 incher a bit more comfortable. Flipping the stem along can give you a few MM more reach.

Stem Comparison Tool | yojimg.net