Right in both places. TM was also my favorite but lately Shell F-7 shut down its service station to install machinery for cold gas. Now i think both are equal. Also, Shell F-7 houses five dispensers which means they refill ten cars at a time.
And yes, Caltex F-10 is awful indeed, whether for cng or petrol. There is some problem with their petrol guns' triggers which is why the supply shuts off before that car is full even. Their cng is just as bad as others.