That's what I would do. One problem at a time as it were. As for switching, I have also had success with rubbing the old prey item itself, rather than the bedding, on the new prey item. I've also just tossed a live rat into the ASF holding bin for a half hour or so and it work well. Got a couple girls that were fed ASF's by the previous owner and they sometimes get picky about taking rats.