I am in the same boat, and mid-shave stropping has helped me greatly. I typically do 30 to 60 passes before the shave, then 5 to 10 at several points during the shave. Leather only.

There are some really good old threads about this; one hypothesis is that mid-shave stropping keeps the edge from ever really getting out of alignment, so you need fewer laps.

It has some detractors, but I'm not one of them.

Josh