The thing is, once you find that the logic of how you decide what to do includes good actions being conditional on being virtuous, it becomes clear that the part about self interest is not essential, and your logic would be clearer if you refactored it to remove that.