Yes... Go to the pillows mask and a good chinstrap. I prefer the Resmed P10 with a pillow size one larger than what I think I should use. So I use the large pillow size. I also put the chinstrap on first, gently applied so as to "encourage" the jaw to stay forward and the mouth to stay shut. In the end, the actual blocking of the airway occurs because I have learned to use my tongue applied to the roof of my mouth. It takes a few days to figure that out, but it's really a quite natural thing. Once mastered, you may even be able to eliminate the chinstrap. I cannot however.
Secondly, and equally important: You need to establish a range your machine is allowed to operate within other than "puny to tornadic." Download, install and begin using the Sleepyhead software (link at the top of the page) so you can see what your pressures are doing, what your ahi is doing, and how many OA's vs: CA's etc... You are probably correct that your counts are off if your leaks are out of range. But the place to start is learning where your body likes to be, then adjusting the pressures so the minimum and maximum are not light years apart. In particular you don't really want to use a max 20 with a pillow system, or pretty much any other system, if you don't have to.
Do you have a Mirage Quattro mask? If you do and you have tried it and it has bothered the bridge of your nose, there is hope. One of the fixes that has been posted on this board is to cut away a little bit of the silicone stiffener at the bridge of the nose end. Do not cut much. Only about 1/8" from the end of the stiffener at the bridge of the nose end. Be very careful not to accidentally cut the flexible silicone seal material.
If the Quattro air has similar stiffeners, the same procedure might help.