Agree …
Maybe 1 WP instead of 1 AP, since the free aim is the business card of the game and should therefore be used as often as possible.
I would also like 1 WP for Overwatch (of course for both sides).
This “minimal” use of WP would also reduce the constant repetition of skills, since WP pool always shrinks somewhat.