Transaction fees are large enough now that the system will probably have to change. At some point transaction fees will be the majority of the reward and then the existing system becomes more like solo mining and less like pooled mining.

The likely solution will be to have the transaction fee included with the mining subsidy when the score is calculated for the share submission. This unfortunately removes the 'bonus' aspect of being a block finder though. Perhaps some mix of the two.