Why did you let her sit on your lap? Kind of undermines all of those boundaries you just set...
I'd say keep doing what you're doing. Usually, I find that if you don't have a clear direction, that it's best to not make any drastic moves - the path will unfold before you.