You are completely right in the direction you are headed. I have 2 Saas as well and let me tell you that it's the best thing to offer services and get paid.