I had the exact same situation as the OP in a game last wee. I called B20 for a hold, which was the 6th team foul. He showed his displeasure after the call and I whacked him, making that the 7th team foul. My partner was a rookie and he ended up in front of the table while I was administering the free throws. I had to go explain to the coaches of Team A why they only shot two free throws AND had to tell the table several times that yes, both fouls count as team fouls and personal fouls for B20.