I'd be fine trading madrigal and covering 2b through free agency. Has been good options last few years for cheap. Requires believing that Hahn can identify a good free agent, but that's the world we are in.
Of the positions where you could say "we can feasibly cover this in free agency without worry" I'd point to 2b, corner of and C, and obviously 1b but ideally we can produce a freaking 1b.