Yeah, I understand that one. If you're not familiar with a new way of coding, it's not a great idea to try it with such a tight time constraint.
If you do go ahead with refactoring it to make it easier to upgrade and come across any issues, drop a post on the forum. I'd be happy to help with it (I go by MrMen on the forum).