Quit counting blocks, and just eat a lot of quality Paleo food. Lots of meat and eggs and vegetables and nuts. Eat til you're stuffed 4 or 5 times a day. Throw in a coconut milk and whey shake after workouts if you're having trouble fitting enough protein in. You could also throw in a quart or half-gallon of milk per day for extra protein and fat calories. GOMAD is probably not a good idea if you want to maintain some metcon capacity.
(WFS) should be your go-to reference.