No, being flat and being homogeneous is not equivalent$^\dagger\!\!\!$.
Flatness refers to the geometry, which depends on the total energy density $\rho$; if it is above or below a certain critical threshold $\rho_\mathrm{cr}$, we call the Universe "closed" or "open", respectively, while if $\rho$ is exactly equal to $\rho_\mathrm{cr}$, we call it "flat".
Homogeneity refers, as you say, to matter being evenly distributed (on large scales). If the Universe is not only homogeneous, but also isotropic (i.e. looks the same in all directions), then there are three different possible geometries, namely flat, open, or closed. But a homogeneous universe doesn't have to be isotropic, and both open and closed universes can have evenly distributed matter.
Thus,
$$
\mathrm{homogeneity} \nRightarrow \mathrm{flatness}
$$
Whereas the local geometry depends on the local density$^\ddagger$, the global geometry does not depend on how the matter is distributed. For instance, you could in principle have a universe with no upper limit of structure size. In our Universe, we find observationally that the largest structures have sizes of roughly half a gigalightyear. Above this scale, it is homogeneous (although it could be inhomogeneous on scales larger than the particle horizon). But another universe might have structure on all scales and thus not be homogeneous, but still meet the criterion $\rho = \rho_\mathrm{cr}$ and thus be flat.
You could also, as discussed in this answer about homogeneity and isotropy, imagine a universe originating at a central point away from which the density always decreases (i.e. is isotropic around this point), but which still has $\rho = \rho_\mathrm{cr}$.
Thus,
$$
\mathrm{flatness} \nRightarrow \mathrm{homogeneity}
$$
Note that while your statement about the geometry determining the fate of the Universe would be correct if it contained only matter and radiation, it seems that $\sim70$% of the density making it flat has the annoying propety of accelerating the expansion of the Universe. Thus, whereas a flat, matter-dominated universe would expand asymptotically toward a finite size, our Universe is dominated, it seems, by something dubbed dark energy making it expand exponentially despite being flat.
$^\dagger$For a universe, at least. For a roadkill, it might be equivalent.
$^\ddagger$For instance, space "bends" enough around a massive cluster of galaxies to make gravitational lenses.