two different expressions both are grammatical correct.
but they are expressing two different meaning.
like the first one, it means you plan to do sth, but now you have not do it right now. it maybe happen in the future.
the second sentence is one that express you are doing sth,, like you are now traveling to japan,,maybe right now you are just on a plane flying to japan.