Indeed, if you are WAT-limited and then climb into a significant inversion OEI you may well find yourself dead in the water at the inversion ie if you know there is a significant inversion then it probably is a good idea to consider going into the WAT charts with the maximum lapse temperature rather than surface temperature if the former exceeds the latter.
Not a requirement but might help you not to spoil your day.