Another immigration lawyer consultation may be in order.

I would also advise providing no more detail on your trip on this forum. While I believe you intend to depart the USA, the CBP is not filled with people as trusting as moi. As a known CBP officer was active on FT this morning (and I can almost hear him salivating), it is not unreasonable to assume that any additional detail you provide may increase your chance of an unpleasant encounter.