Getting stuck and reworking large parts of your plans are all part of the process here. Last year I rebuilt my combat system 5 times before I ended up with something I liked. You seem to have a good approach of sorting out your code issues, so I'm sure you'll get your tentacles to do a variety of slithery things soon enough!