Changing agreements is good, but when you were dealt this hand you had to bid within the structure you had. You didn't have a way to show this hand. So now you must guess. The key here is that you know more about partner's hand than you can show about yours, and you have limited ways to learn anything except how many aces he has or whether he has an extra J. I would probably bid 4C and bid 6NT if he has two. I wouldn't strongly consider a diamond contract. And I wouldn't ask partner to decide. Two final things to consider. 1NT-4NT would deny interest in the majors, and luckily you do have an honor in each. If partner is savvy enough to know you have a minor suit oriented hand, 4NT might work out. The other consideration is the field. If it is a strong aggressive field, you're more likely to be punished by bidding short. If it's a weak field, 3NT or 4NT is probably safe.