The oscillator should help with counting waves.
Here is an MT4 script that is useful for labelling waves in a simple way.
Probably could be easily adapted for use in MT5.
Note the include.
You need to change the options and recompile each time to label different waves with numbers/letters/font size etc.

Econome.