A new shop has opened up at breakwater. It's called Out to Sea and they opened in July of last year.
They offer charters, fishing supplies and some dive gear including fills - only air though.
If you're parked around the area, they have a pick up and delivery service for your tanks. Just ring them up and they will come by with a cart so you don't have to carry, lift, or drive them over yourself.
Edit. Just noticed this was posted in Feb 2018. Oh well. A bit late but maybe not so late for newer visitors.