Go with the toilet training because it sounds as though she's ready. She will still wear nappies overnight and during naps for a while yet.