It sounds like what you have is working. Just because your setup is different doesn't mean it's wrong. If you are happy with the result and the machine works OK, then why change anything?
The proof is when you make a cut, if a square is square and a circle is round, and they both are on size, then it's tuned correctly.