its usually easier to trim leaves right after harvest and you just cut off the leaves as close to the bud as possible or another way of putting would be to cut the leaves flush with the bud.
your drying and curing method sounds fine.