Fix & sell the X7.
Then you can afford a tournament / speedball marker that you can use in either scenario
Had experience with an etek 1 and absolutely loved it. Apart from the chunky frame it was a nicer shooting gun than my ego 09 at the time! Owned a pmr as my first marker ages ago and it was nice but chucked it for something better as soon as I had the cash. If you're set on just those two then I'd recommend the etek2. Being new to the sport, the etek2 is easier to maintain and generally a bit more robust!
Just set yourself a budget when you've the cash and post a wanted thread on here and see what comes up. Youtube and google tech specs and videos of maintenance, how they shoot and any down / upsides to them.
GENERALLY SPEAKING anything by the big makers mid - high end, you'll be happy with. Asking which is better etc will get a stream of people telling you that the gun they use is much better than it's comparison by another, when in reality you may think the opposite