I don't have any male cat spray to deal with, but I do have the occaisonal pet (both dog and cat) mishap on the carpets, so I use Petzyme that I get from PetSmart and it works very well for me at least. I would assume it would work well for the cat spray as well.
The cat may be spraying extra because he doesn't like the clorox wipe smell, so I would try something else that is designed for pet cleanup. The Petzyme doesn't smell much and our pets don't re-soil the spots that have been cleaned.
Glad to hear you have relaxed about the cat spray. It probably is the baby, as most animals don't like moving down the totem pole of attention, plus being chased might not be his favorite. Just your relaxing about it will make the cat relax and he should do it less....hopefully. Just give him extra attention when you can. You might also want to try giving the cat some Rescue Remedy, which is a Bach Flower Essence. It works on the emotions and works well for animals that are upset.
Best of luck to you.