Rotate Default Model Orientation
The situation you describe is a result of a failure to apply the rotation to the object. It may be possible to edit the model, but I find it is quicker to apply (keyboard shortcut combination:  CTRL  -  A  as soon as I've made the desired rotation.