How are you adding chromatic notes? If you limit them to the notes in between M2's, and the M7, you are only keeping track of five notes but have the option of playing up to nine.
e.g.
------------3-5-------
-------3-5------------
--3-6-----------------
vs
--------------------3-4-5-
----------2-3-4-5--------
--3-5-6-------------------
You can also fit three diatonic modes into the pentatonic in a similar way, but I think it is easier to focus on where the half steps between 3 & 4 and 7 & 8 through all the octaves, then connecting them with whole steps. This way you only keep track of four notes per octave but play all seven. You can make it even simpler by remembering that 7 & 3 and 8 & 4 are a P4 apart, so they are the same two frets one string over. 3 & 7 and 4 & 8 are a P5 apart, so they are two frets higher and one string over.
e.g.
--2-3----------------
--2-3-----------------
and
--4-5----------------
--2-3----------------