try to get high octane mixed in half quantity when you get a refill, this may end the issue.
and do get petrol from some other pump! in my other car, vitz, the same issue was there and i was constantly going to the same pump. the mechanic asked me to get high octane and to change the pump. the issue ended.
its just a suggestion