both those dogs are too small.
If I got a dog of the size you deem desirable, my entire apartment would effectively be the crate. When I went to the shelter, even the "medium" dogs looked to me like they'd be totally claustrophobic in my setup.
my older dog is 46 lbs. too big for you, no arguments. my younger dog is 29 lbs, and it's pretty much the perfect dog size. big enough to do medium to large dog things like play w. tennis balls, run super fast and jump super high, harass small animals and not have that weird small dog attitude of wanting to fight bigger dogs but small enough to hardly take up any room, can be picked up and carried around w. one arm and generally be very convenient.
in summary, look for a 25-30 lb dog.