Reply to What to do now. Live DJ v. Linerar mixing tools

So a couple weeks ago I got my Kontrol S2, been spending some time beatgridding my music, made a couple mini-mixes and I am starting to believe that my aspirations to doing live-DJing again might not be the best route and maybe I should really be considering more "linear mixing". I'm a perfectionist and the few mixes I have made so far are OK, but I want to add more complexity into it, and I am doubting the limited time I would be able to play with my S2+Kontrol will allow me to really master it to the point I am satisfied with it.

I have played with Mixmeister before, and while it does a descent job with beatmatching, the effects are a bit limiting (far more limiting than what I can do with the S2+Traktor). Are there other solutions out there that will allow me some more creative control that I can do with S2+Traktor that allows me to do non-destructive linear construction of mixes?