You can definitely try switching her right now, she may or may not take it, just don't starve her so long that she starts losing weight.
As for the yawning, does she keep her mouth open a little bit or close it right away? Sometimes they will open their mouth to breathe when they have an RI.