You are now correct, though clue two was more a reference to how one puts a body in a Jefferies tube, feet first.I curse you sub-clues...
New guess: Journey to Babel.
1. Spock and Sarek in conflict. Ambassadors in conflict with each others. Mystery spaceship in conflict with Enterprise.
2. McCoy asking Spock on how to do the Vulcan greeting sign.