Well.... this morning I did 25kms at 2500rpm with no issue.
Then I did the same journey the other way (which included the uphill segment) at 2500rpm and no issue.
Did the 5km hill climb at below 2500rpm, due to a big rig in front of me, and no issue.
So, as the problem only seems to happen...