Quick update, found time to replace the CPS today and got cured my CEL. Old one was pretty damn bad. Also noticed my head gasket could definitely use a replacement so hopefully I can get to that within the week.