Yes, that would be the approximate ATAR that you may achieve in the worst-case scenario.
The rank change in Modern History, while reflecting a lower position, is not significant. This means that its impact on this estimate (as well as others that you may receive) will likely be negligible.