Liver is one of the highest density foods for nutrition. The reason you may feel less energy after consuming it could be related to the herxheimer reaction. Your body getting proper nutrients so that it has the power to kill invading microbes. The result is the leaking of toxins from the invaders and your body having to work harder to detoxify.
I at one point avoided eggs as much as possible because I would get all sorts of symptoms and fatigue from them. Turned out it was just what I needed though. It was a sign that I was detoxing from the sulfur and absorbable proteins I was getting. I eat 4-5 eggs a day now with no reaction and improved energy.
other than that your plan sounds pretty solid, and I agree with you about the factory farm stuff.