Your new basis in-kind should be the amount of the distribution on the 1099-R.
That is my experience.
Move your business to a brokerage that does the recording correctly.
@Solar Eclipse
