Hello Dan:
You are doing a great job on this 'conversion' to the prototype. Your changes, subtle though they may be, are well done. The control stick fix shoule be an easy fix, hopefully. The turnbuckle looks good as well. Like you said, you are having fun with it.
Looking forward to your next update.
Best
Mark