I support leaving this as is. Regardless of what AASHTO says or what the official state map implies, signage on the ground clearly and consistently has US 80 on the bypass and US 80 Business through town.
So, by the principle of "signage is the final arbiter", the way it is currently in the HB is correct.