I would rebid 2NT on the second one and 3♦ on the first one, although I admit it might be an idiosyncratic (moronic?) idea. On the second one, I have at least some help in all of the side suits, and it looks like a good hand for nt. On the first one, I am wide open in hearts, and have a bit more concentration. Out of curiousity, what would I have bid with 6-7 diamonds, 17-18 points and exactly 3 spades?