As far as i am aware, your rental income should be included in the flat rate calculation! Sounds crazy, i know.
Speak to your Accountant about this.
As for MTD … rental income is to be submitted separately to self employed income. You have it correct as Making Tax Difficult.