Sounds good - I'm finding that MREs are only good for 5 years storage.
I prefer the philosophy of storing food that you regularly use and rotate, that way it doesn't go bad. Another plus is that in an emergency you'll be eating somewhat normal food instead of a complete change in diet.
I bulk up on rolled oats, rice, and cornmeal. Stuff I eat every day that lasts a long time.