As far as going in January, he has no time to change the current ability to go before then. You are fine for the trip, is my opinion.
Regarding beyond that - I know he said he would change it, but Obama did try things in place to make that hard to undue. Can it be? I am sure. Will Trump do it? I tend to have my doubts. Pure speculation.