One thing that should help this is very simple. Suck boiled sweets...the sucking motion of your jaws and swallowing will ease the pressure changes in your ears. At one time aircrew would hand out boiled sweets prior to take-off and before the plane started to descend for landing to passengers so that the nasty sensation of popping ears and ear pain would be averted.
I don't dive, but I do have problems with ear popping when flying, and have used the boiled sweets every time for years and it really does work. Sucking sweets during take-off and climb and then all the way back down to landing from the start of descent will curtail at least 90% of the ear problem, if not all of it.
Hope that helps
