I've noticed that if you beam down without an away team, you can relog and they'll be there with you (assuming the server isn't too busy to allow you back in....)
Also, for "ship-on-the-ground" syndrome (and its cousin, "person-in-space-itis"), it seems that if you can make a dialogue box pop up, your will revert to the correct model. i.e. If you find your character walking around the sector map, just have a quick chat with Mr. Replicator (oh noes the Replicators!) and he should sort you out.