There has always been controversy about how to best prepare general aviation aircraft engines for long-term storage, but from my viewpoint, you’ve covered all the bases and then some.
Source: general aviationA master class in how to winterize your airplane