Combining the two challenges is a great option! We love seeing variations of the elements or progress on the elements rather than cutting out a skill entirely. Pulling an element from the other challenge is a fabulous way to do just that.
Happy training!