Don't get carried away, I personally would be shooting a 2016 as you and I have nearly the same set-up, but make sure your nocks aren't too tight.
How is the arrow looking before it gets to the target? I would suggest that you try to shoot on a level plane, in other words make sure the target butt is at the same height as your bow, if you are shooting downward and you are not directly in front of the butt, it can give you a false reading. Ken Beck stated that a little nock right or left is not a bad thing, do you cant your bow when you shoot?
I think from what you stated, you are on the right track. I will be in the woods Sat. and Sun. let me know how you fair this weekend. See if you can borrow a 2117 or 2016 cut to the same length and let me know what you think....Scott