Your 20 ga set up sounds about perfect to me
While I have 12, 16 and .410 shotguns, I have always found a 20 ga side by side is the gun I use most often to hunt birds. Much like you, I limit the ranges I shoot, and rarely use dogs. The only difference I have ever found between the 12 and 20...