The working yarn will always be on the right needle. That's the best way I know of to be sure you have it going the right way. Having a marker of some sort on the front is helpful also. A coiless pin or piece of yarn in a contrasting color that is easy to see works.
This is the last time I'm frogging this project for the last time.