Enemy lock when it's attacking the player

Combat is almost perfect, but in my 170hrs of playing, the one thing that consistently frustrates me is when an enemy is just off the screen, often firing arrows, and you can’t lock it. This particularly difficult to deal with when its above as well. I have a bow, but keep shooting at my height while the enemy shoots me from above.

Could I suggest that if an enemy has the player targeted, but the player has no lock, and then the player presses / holds the attack button, the auto-lock should lock on that enemy (or the closest if there are multiple enemies).

Other that that I really love the combat system.