I also created a question on StackExchange: https://bitcoin.stackexchange.com/questions/120933/constructing-a-block-template-to-avoid-mining-empty-blocks