In case it helps anyone, DH and I went on a British Red Cross / NCT baby and child first aid course the other day (other ones are available, it was just the closest one to us). It was brilliant, a really informative 2.5 hours. It covered the obvious stuff (choking, CPR, burns, with theory and practice) but also the less obvious stuff (febrile convulsions, meningitis, head blows, water incidents...).
I've found it worryingly easy to lose hours and much money on what is probably inessential baby stuff. You're probably all ahead of me, but if not, I highly recommend a course like this. If possible I also recommend either going while pregnant or tag teaming so you're on the course without a baby. They pack so much into 2.5 hours, one poor dad with a colicky baby missed a lot of what was said.