I was able to get your map with the grid to line up in Maptool.
I just turned off snap to grid on the map. Adjusted the grid and all was good.
Make sure to write down the grid size once you have it set. Then go into Preferences and change the new map size to what you wrote down. Then your...