Reply to Critique my setup - 1d, 2d, nuo 4, launchpad - for djing and production

Hi. I'm building a setup for two use-cases:

1. DJing in Traktor, with drum machine and clip-launching support from Ableton live
2. Production in Ableton

I'd like to use the same gear for the two use-cases. Basically I want to buy:

1. Ecler nuo 4 - for mixing and traktor effects control (I already have, bought for $250 used)
2. Xone 2d and 1d ($250 used)
3. Novation launchpad ($75 used)

I'm selling my mpd32, which is largely only useful for production work, to get #2 and #3

I want use the 2d and 1d for controlling track volume, sends, selecting, etc in ableton for the second use-case, in conjunction with the launchpad.

Is this a good idea? Is there another combination of gear that would suit my needs better? Should I just get an APC40 instead of the xone controllers and lanchpad?

Please see the setup map for live use below: