Ability to include the user's Location Name in an order report

In the report writer, there is the ability to include Location Name. Unfortunately that is not the user's location name, but the Ship From Location from Site Settings. I would like to include the Location from the user's settings.

We need this because we do temporary stores for customers where we collect orders for a set period of time, then ship them to various locations based on the user setting. I know that we can still get the ship-to address information in the report, and that is helpful, but we would like to include that in the order report, as well.

The current work-around is to export the user's list and join it together in Excel. It works, but is an additional step that we would rather not have to perform.