While lenses in the 18-21mm range are my favourites, I normally pair them up with a 35mm.
If 50mm is your "normal" lens, I agree with the others about going for a 28 (or maybe 24mm).
None of these are 28mm, but:
The 20mm Flektogon you mention can be very good, though the f/4.0 is supposed to be even better (that's the one I have).
The 21mm Mamiya in M42 (also available branded as Rolleinar or Voigtländer in Rolleiflex QBM mount) is decent, though probably not better than the Flektogon.
The Zeiss 18mm for Rolleiflex has a lovely Zeiss 3-d look and I often prefer it for its look to other lenses (not many, mainly a Leica 19mm) which might be sharper in the corners.
A Soviet Arsat H 20mm I had was very good, probably as good or better than the Flektogon.
A Soviet Mir-20M I also had wasn't as good, but still decent if you can get it cheaply.
Way out of your range, but I've found the Vivitar/Tokina 17mm to be surprisingly good.
Hope this helps...
P.S. I also loved the Takumar 35mm f/3.5, but talking about 35mm lenses opens up a whole new can of worms...