CRE Loaded install Pickup/Delivery/Both Options

I need to be able to have the option of providing pick up or delivery or choice of both pickup & delivery for all of my products. This would (i imagine) involve extra fields being setup and available when I add new products, so that i could select pick up or delivery or (both pickup and delivery). Some items will be available for delivery only. Some items will be available for pick up only. Some items will be available for pickup OR delivery (depending on what option the customer selects at checkout). I already have a cusom module installed that allows me to set individual fixed price delivery costs for each product. This works by replacing the weight field with a set delivery price. Whatever set delivery price I put in - is the price charged for delivery at checkout. This is working and will remain the same. (Please see attached). The standard STORE PICKUP module is also setup on the site. At checkout, products with pickup only option available would be listed as FREE pickup. Products with delivery option only would be listed using the existing set delivery charge. Products that are available for both pickup and delivery would need to display both options so that the customer could select their preference. (either FREE pickup or paid delivery) Please refer to the attached screen shot. If there's anything I haven't thought of in regard to this scenario working - please let me know!