Thanks everyone for you help.
I called my airline and they were able to change my flight to an earlier one. Due to the cheap fare class I chose, they weren't able to secure early afternoon flight, so instead I'm flying over in the morning for a noon arrival meaning no issues with trains and whatnot. Plus I get to spend an extra half day in Tokyo which should be nice.
The only thing is I have a long day tomorrow getting everything done.
Thanks!