Jen, it sounds like everything worked out for the best! DaVinci still has his happy home, complete with freshly trimmed claws, and now you have permanent visitation rights!!!