this is what I got without hints:
and after the hints:
my personal feelings:
万水千山&山穷水尽 is a bit hard without hints, I was thinking about 万里之遥&遥不可及/遥遥无期.
背城借一，I didn't even know this word until I googled "带城和一的成语".
A and 4, I still don't know what they are.
UPDATE after new hints: