I think you did a great job… ESPECIALLY on a wiggly puppy! I bet even Whimsy wiggled when she was a pup!
I have to say that my grooming became MUCH easier when I attached a grooming loop to the underside of the cabinet above my washer and dryer to be my "extra hand" during grooming.
Since then, my husband was nice enough to give me a very nice complete grooming station for Christmas. This became necessary after we remodeled our downstairs, which included stacking the washer and dryer to put a shower in the that bathroom. No more convenient grooming space! But I have to say, the washer/dryer grooming station was perfect. It was a great height, and very convenient. Now I have to take him up stair to the spare bedroom to groom him. It IS nice to have all my tools in one place, though, and the whole set-up (table, stool and tool caddy) was only $200 at PetEdge. I already had the grooming arm, but you would have to buy that separately.
Oh! Another tip… I've found that the very best mats for grooming are the memory foam, microfiber bath mats at Bed Bath and beyond. They are non-slip, comfy for them to sit on, wick water out of their coat as you dry them, and launder beautifully. I use them as crate pads too!