Jonny Cigar

Let's just say that I want to travel light and with a max of two lenses. I currently own a 16mm f1.4 and a 35mm f.2 and would like to take street photographs, cultural events, portraits. I would like to experiment some astrophotography and landscapes. ...but after trying the 16mm for a while I founded very wide and with lots of distortion due the wide angle. It's got some amazing reviews but maybe its just not the way I look at things. So I am tempted to sell the 16mm and get either a 23mm f.2 or 18-55 (apparently amazing kit lens) f2.8-4. So my travel kit would be a 23mm and 35mm f2 or 18-55mm and 35mm. what would be the best combo? Or should I just keep my 16mm? any suggestion would be appreciated thanks