Gabrino, definitely go by your lo's tired cues but, if you see that his total awake time is approaching an hour put him down for a nap. Swaddling is a great idea as it helps calm the baby and prevents him from waking himself up again when he's drifting off. Also, start to incorporate a short wind-down routine. If he's crying by the time you take him to his crib, it means you've missed his sleep window. No matter, he still needs his nap; it may just take longer to get him to fall asleep. He should be getting 15-18 hours of sleep per day total.
Are you sure that he's crying for more food? While it's definitely possible that the little guy is hungry, make sure that something isn't bothering him, like reflux, or just that he's very tired. If he is hungry, just give him more formula at each feeding (I believe you are supposed to increase the amount as they grow).