If partner bids a major, then you should probably just bid 6, unless you and your partner have discussed better methods for investigating slam after 1NT openings.
Don't be discouraged, this is a very difficult hand, one that I would have problems with in a new partnership. I didn't pick the hands to be clear cut, I picked them to make you think about what you are bidding and why.