Trainman, you are doing such an amazing job, such an inspiration (sorry if that sounds cheesy). I'll have to re-read this tomorrow when I'm not exhausted to make sure I understood everything, but I'd definitely go with the stone retaining wall.
Mike