Having just seen MnE, I'm really not sure in which series to incorporate it.
To me, it seems like a fusion with a heavy TV bias:

Actually AIC has stated that this movies was held in the OAV timeline
despite the fact it doesn't seem to match up with the OAV timeline
completly. 

	I believe also that they stated Mantsu no Eve incorporates
elements of the manga and/or novels, both of which are set in the OAV
continuity. Well, loosely, at any rate.

>From Andrew Huang, brought to you by his computer, Oddzilla
Oddzilla says, "Mmmmm...Evanjellydonut...."
http://www.hcs.harvard.edu/~alhuang/
Harvard Anime Society, President