I believe Bad Wolf was indeed a melding of Rose and The TARDIS, and I believe The Moment's Sentience was indeed a Bad Wolf incarnation. So, yea, Bad Wolf, The Moment, The TARDIS, all the same thing, IMHO.
One Day I hope to be the Man my Cat thinks I am
Where are we going? And why are we in this Handbasket?