I pulled the trigger too early on this issue.
It turns out that the 3rd party application that was using the geocoding service was at fault.
I used the geocoding service from within ArcMap and it returned the correct results - building address first, street address second.
The third party application returns street address first, building address second.