Crisis averted, an SMC reset appears to have been successful at fixing my MBP issues for now.