Keep the Oly 17mm 1.8 or the Panasonic 20mm 1.7?

I agree, keep both! (or sell one on eBay, but don't return it)

It is a large strain which is placed on these photography businesses (or any business!) to have to unnecessarily accept returned goods, don't do that to them. I've never ever returned a new item in such a manner.