I would think you are trying to live in the moment and since he is in recovery he should understand the 24 hour pledge and moving forward. Maybe say your amends and move on. If he is "truly" a good friend, which I honestly believe he may be, then he will stop this since it is upsetting you. I would never want to upset my friends unnecessarily and if they told me I was bothering them by a certain behavior I would then change that behavior.