Shipping Surcharge For Some Products

I have some paint products that attract a shipping surcharge of about $2.00 per can.

I tried setting a $2.00 shipping freight cost in the shipping properties of the product. This gets added to the freight quote, which is good.
The problem is that it also gets charged in the "Pickup from store" shipping option, which obviously should not. This also leads some customers to select the $2.00 as freight cost, which is worse.
Where or how can I add the surcharge so it gets added only to the freight quotes?

For example, you can create promotion and make free shipping for pickup if order total is more than USD 1