Yes, in this case you'd need to intervene as you describe but have you considered simply reducing to climb thrust more promptly if it looks like your 160kt constraint won't be met?
Open climb is also a possibility if terrain clearance is an issue, but with TOGA set, a light aircraft, and an increasing headwind you will approach the 30 degree pitch limit.