How you're describing it, I wouldn't touch a thing. Sounds like you're tuned pretty close to perfect and any adjustment could just make your groups and broadhead tuning worse.

I wouldn't worry about how the arrows are hitting the target at an angle, especially at 40 yards, by that time it should be straightened out even out of an untuned bow. Probably just something in the target causing it.