Check out Partakers of Grace: https://canonpress.com/products/1-corinthians-commentary-partakers-of-grace/
