"Are discipleship and spiritual formation different?"
This might be a bit of an oversimplification but basically but: "No! Discipleship has roots in Gospels and Spiritual Formation in Pauline literature."
(I also think education is another way of talking about these things to some extent. I talk about these things more in my opening lecture for my Discipleship in Community course).