It sounds to me like what you're doing is working. He calls, texts, comes over to obviously be with you - which makes me think he isn't having an affair.
He responded really well to your boundaries, I think - and from what you described about his job situation, he sounds like the type who can deal with rules and regulations.
I would just continue the great work you are doing. And think about yourself and your own goals and 180's and GAL activities.
M 16 yrs, WH62, P54 3 adult blended kids EA 11/13, BD1 6/14 PA fall 14, BD2 2/15 Piecing 2015, BD3 12/15 Separated 4/16 WH moved OW in 5/16 Divorced 6/15/17