The sizes above should work. As you know from your experience with the big leech pattern, how big depends a lot on the fly pattern and a little on conditions. Generally speaking, the more clarity and lower the flows, the smaller your flies should be.