It sounds like he likes you a lot. Is he okay now?

From what I've read, fighting is the most effective way to get them stronger. Without it, they can't learn more moves outside of TMs and HMs. Oh, I do remember a good way to strengthen a newly hatched or weaker pokemon though. You send them out into a battle first and then swap them out with a different one as soon as possible.