I wish I had the courage to run my own CI server. But yes, I think your approach is the best for serious teams that can manage more infrastructure.