Sounds like an interesting history to me, and pretty much explains away any issues I had. You know, assuming this village survives the battle I'd quite like to see a map of it 10 years on - by the sounds of it this place is going to explode in population and wealth very quickly.
Those little wharfs and moorings sound like a nice addition. As for the pastures, you'd need a chunk of common land near the centre of the village, which is already there in the space between the centre and the cluster of houses to the east. You could also recolour some of the existing fields to look like pasture, as they'd be part of the crop rotation anyway (I think, may be wrong). Otherwise, sheep and cattle are often kept where the quality of soil isn't as good and it's harder to collect the crop. The steep sides of depression north of the river may be a good place for sheep for instance. Dunno, just a couple of ideas.