Ok, that looks like a better approach.
Added form 3805P with the total distribution on line 5, which generated the correct 2.5% tax into 540 line 63.
