Glad Peanut is doing better.
As for shaving it's better if they can get to it easily and without allot of fuss. RB Butterscotch was shaved to get blood. I also think it depends (shave or not) just how much they need for a sample to run certain tests.