I hope you decide to skip the shelter all together and keep him. Do you have a good working relationship with the shelter?

I thought I did with ours. I once took a kitty there and made sure all the paperwork said that if he wasn't adopted, they were to call me before euthanizing. They didn't call! They said it was a "clerical error". A kitten was needlessly put to sleep. If I had to do it all over again...........