yes ur doing it right, and also leo has two endings
the question that determines your ending is the last question of his route where you're at the train and your choices are "we'll work something out" or "its over". if you chose "we'll work something out" which is his bad ending you can try doing the "it's over" option which is the best in my opinion.