Waking more often and changes in feeding patterns, irritability etc are quite normal at this age.
I'm no medical expert, but it sounds like he's ok. I don't think formula is really necessary at this point, given that he appears to be happy and healthy in all respects.