Ended up saying nuts to the upgrade because the error kept occuring, no matter how I changed the timeouts in SQL. Rolled back to 11.3.2 and reran the tuner and left it at that.