Lets start from the top. If you were extracting 2100mah from your 2200mah batteries, you are killing your batteries. You should be targeting about 80% capacity of your batteries for longer battery life. On your 2200mah batteries your target is 1760mah. On your 8000mah batteries your target is 6400mah.
having said that, I have zero experience with a naza, so help me out. What is making you land? I'll make some assumptions just for the sake of continued conversation and to try to spark some ideas. If there is some kind of voltage counter, or amperage counter on the naza controller, have you tried resetting it? It sounds to me like the controller continues to use the 2200mah battery settings with your 8000mah battery packs.
Rafael