Hi shadowfoot. I can relate. There is one thing I would advise you do, which is to eradicate gluten grains from your 20%. There is nothing you can do that will help your bowel health more. Apart from the gluten itself, wheat also contains wheat agglutin, which damages gut brush border cells without even having to involve the immune system (in other words, it's directly toxic to them). Add to that the fact that 5 out of 6 people show an immunological response to gluten, and you've got yourself something that really shouldn't be in anyone's diet.
In my opinion, the Primal diet is better than the GAPS and SCD diets, unless you react badly to saturated fats which is pretty rare. I wish someone had said to me 6 years ago - "Just go Primal and forget about messing around with all that other stuff" - I'd have been much healthier, much quicker.