too many options... i would also do something like a Chinampa ( on the banks ) and use alot of edible aquatic plants like garden cress, water cress, Acorus gramineus ''licorice'' , edible hardy alocisia species , hydrocotyle vulgaris.

I would also use alot of annuals like bacopa monnieri or lemon bacopa ( bacopa caroliniana ), other edible nasturtiums, gotua cola.

For a edible edge you of course can use annuals but for perennials i would go for Rubus fruticosa thornless evergreen ( a really reliable heavy cropper ) and actinidia arguta ''issai '' which is self pollenating and a reliabe medium sized climber which can be trained to a bush.

you have alot of choice. just be sure that you apply a base layer of plants which fix nitrogen. 2nd you get edibles that are heavy and reliable plants on the designated locations. 3nd you fill it up with edible annuals. 4th you get the proper ornamental plants and plants that have medicinal value.

cover other stuff up with nice ornamentals lysimachia nummularia '' aurea'' cultivar or other groundcovers that are not large.

First you need concepts... on hills i would make something like terrace farms like you see in some ancient asiatic or south american places.

with water i would do floating gardens or Chinampa without blocking streams ( on the edges of banks etc )

i would use a huge list of plants and rate them on edible roots , leaves, fruits and seeds. in other words you want plants that contain alot of edible parts and medicinal uses. i would go to PFAF.org they got some good sources.

have foods every season , make sure you list which plant crops in what season so you get a constant stream of edibles. also have a seed rotation scheme where you save seed for next years yield. be sure to amendt the soil with nitrogen fixing plants and plant matter etc.

also start learning how to conserve stuff by freezing , curing, drying / smoking etc.. using sauerkraut like methods of preserving. you maybe would get high yields so you need to have some methods of conserving or saving.

http://www.pfaf.org/user/plantsearch.aspx
http://www.pfaf.org/user/MedicinalUses.aspx
http://www.pfaf.org/user/edibleuses.aspx

pick the ones with highest edible and medicinal rate.

Make sure you get plants that are easy to propagate through seeds or cuttings so you can get a huge stock for a low amount of money.