Maby you should use some synths, or virtual instruments, insdead of pure sines or saws.
Yeah that may be worth looking into.