Always the same with those clients … 🙂
Unfortunately your requirements sound pretty custom. Only advise I can give you is to use one of the custom field plugins like Advanced Custom Fields or Types. Those can speed up the development of custom pages like you have by a factor of 10, as you don’t need to program all the form handling, but just need to configure the forms and create the templates for outputting the info.