Yes, exactly. At this point, I find both to be extremely valuable, so I'r really rather not do without either of them. If only completing the gym challenge returned your original abilities to you as some sort of tangible reward...