J, you keep quoting power figures, which without spending a fortune on a powertap etc , are impossible to even guess at.
Perhaps a better way is to test yourself on a variety of hills of severity... from 10% 15 20 to 25% and just see how 'comfortable' 'in control' you feel as you attack them. Check which gearing you are using.
If you have run out, on a 15%, then maybe have a think about
getting fitter,
a diff chainset/ cassette combo
add in a fatigue factor question, could you attack that hill in that gear after 50 miles in good order?
on 25%, I have 1 gear left - just in case it gets steeper..or longer.. and longer .