I was re-keying my lock, but neither the old or new key now works.

It sounds like you may have accidentally misprogrammed the new cylinder.  Please watch the below video for step-by-step instructions on how to recover that cylinder and rekey it to your new key.