It looks like you playing both just like I would have. Good work! You have money in the bank and are waiting for the next expected move.
From here I'd pull out of INXR completely and move back into FRPT when 21 is hit with support volume. By then the DMI/ADX should be well into the confirmend entry mode.