Reply to APC40 vs Traktor S2 for DJing

So I currently have a APC40 and I want to start getting into DJ'ing. I've used multiple APC mappings for DJing but for some reason, I just don't feel comfortable with it and have a really bad work flow seeing how Ableton is so open. I feel like if I got a S2, it would help guide me and be more narrow with the flow of my work and the fact it has jog wheels to help me with que points. So what I'm trying to get here is, should I just keep working with my APC and work out my problems and use my money towards a Maschine or some sort? Or go with the S2 and have everything be a hell of a lot easier, and plus I would be able to get my eyes out of Ableton for once.