Steam heated rail cars aren't needed.  Bitumen pellets can be shipped safely in coal cars.
Diluted bitumen was a solution to the problem of how to use existing technology (pipelines) to transport a new product that is not suited to that technology (oil sands) instead of looking at the product (oilsands) and asking the very simple question, how should the goop be transported safely?
Now CN and U of Calgary have come up with solutions.
I agree that the terminal should be moved.  I have shares.  ;)