No suggestions for improvement.
What I do: Entire laptop is linux. Full disk encryption enabled. When I leave home in the morning (I almost never take my laptop for walkies), I hibernate the laptop. When I get home at night I enter the long FDE password.
Long term I hope that I remembered to hibernate on the day when a burglar takes the laptop. I don't much care if I get it back, I just don't want the data to be used for ID theft.