i think a quick fix for COD would be in
admin area> Settings> Payment Gateways>
adding a COD section with dropdown selection, similar to when you payment details. so you can select 1 of 3 options (Delivery, pickup, both). this will allow some to restrict COD either to Delivery only or to pick up only or current which is to allow both.