You can always remap your x1 to your liking 🙂 I can recommend http://www.faderfox.de/dx3.html this one, extremely small and versatile, easy to map. But you are without good hotcues or remix deck controls, so maybe an lpd8 would be nice,too.
A F1 Is excellent for loop,hotcue and fx control if you map it yourself – fx on knobs/faders and loop/ hotcue on pads. It even comes with a map especially for the purpose for using it as a conplementary controller with a dvs setup, which would be to your liking. and As an extra you can switch to full remix deck control any time 🙂
Best look for a controller with the knobs/pads/buttons/faders you need and map them. You nearly always end up with controls you have no use for at the moment 🙂