'Optimal' mass is a misnomer, the actual Optimal point is 50% of the optimal mass shown, then E-A progressively give bigger bonuses. See the links in my sig for more details.
the 'Optimal' mass figure given for thrusters will give you your ships base flight model regardless of thruster rating. So a 3360T ship with 8A thrusters flies the same as a 2240T ship with 8E. (However a 1680T 8A ship is better than a 1120T 8E ship)
In terms of outfitting if you're just trading D is probably your best bet for improved jump range.