Try the
General Flight Procedures in the AIP for a definitive reference.
The instruction there is merely to "adjust the speed and level in accordance with current flight plan" so I think the question is not necessarily answered unambiguously. My interpretation would be, in Scenario 1, yes, you should climb. In Scenario 2, it's less clear if a descent is appropriate until the next planned change of level.