Help running out of modifiers!

Edit: Using an APC40 and re-iterating my original question

As the title suggests I'm running out of modifiers in one mapping and need to find a way to get around this problem, I'm considering using multiple mappings, though one thing sucks I can't rename each one in traktor on the pc (if so let me know), maybe it can be done on mac.

What I've seen from past experience is that the modifiers from one mapping does not hold true to the other which seems to allow for a great amount of possibilities but modifier usage will be heavy.

So if I keep one modifier as an empty page on each of my mapping for the buttons I use, like M1=0 being empty, and M1=1-7 are full I can switch between the mappings using buttons by using on map1 M1=2 when I want to use this page, and on map2 map M1=0 to the same button to stop clashing (as its an empty page).

What I'm looking for is a response to let me know that my logic makes sense with traktors interface or if not, where it fails.

Thanks all!