We had a HUGE project to update to 3.6. It was time consuming, but the worst part, was learning the ins and outs of updating. I know it seems like a monstrous task, but it is WELL WORTH THE UPGRADE! Do yourself and your team a favor, make a plan to update to 3.6, the benefits outweight the work you have done previously, if you upgrade correctly. Backup, Push and revert if problems arise, work out the kinks, then you will get through the upgrade.
Others commenting, might think an upgrade of that magnitude isn't worth it, but it's simpler than you might imagine or better yet, simpler than your first try!