A word of warning about this 'expect the cloud base is...' business. Psychologically your building in a potential overload, ie. when you get to 800 feet and you haven't broken out yet and you don't have a plan for the last bit. Stress, stress, stress!
Also I would suggest that, bearing in mind that you may not be as current on partial panel as you should be, one would perhaps be best served by keeping the workload as load as possible. That it to say continue with the trimmed speed until you are stable in the glide then perhaps slow down gently to min sink and head into wind.
Those two items will put you in the most survivable situation you can hope for in your current circumstances.