You mentioned your formula where MLW and MZFW is taken care off.
Yes you need to take care of MTOW too.
And do not forget the "hidden" limit, that of NORMAL Take Off fuel from your Destination.
Otherwise you may find yourself doing Tankering with "expencive" fuel !!!
or tankering when it is not required.