Harry - No, he does not recommend leaving the mainsheet cleated when righting. You need to spill any water that it is holding. I think the goal is to get the both the tramp and the sails working for you to lift the mast.
Impressive that you could right the P19 solo.