I see you are in Vancouver, so you'll be going slowly everywhere anyway. (Just kidding, a little)
The 21s look nice, I'd keep them.
Longer treadwear 20" could be great if you just want different wheels. Compare that to the 19" imho if the treadwear of the 21" doesn't work for you.
Either...