If the simple things don't fix it, it requires deeper investigation. The fuel pump is controlled by the ECU. The fuel gauge however, it not - well, that's my understanding. So it seems odd that both pump and gauge 'misbehave.' It's time to get your digital multimeter and do some voltage...