3-1-4-2 is actually my fav formation to counter the diamond. Equally effective is the 4-4-2.

If you believe that he was playing defensively, may I suggest you stick to the same formation but play defensively on the counter as well.

I have also found a defensive 4-3W-1-2 effective in countering teams that are stronger/similar strength regardless of formation.