exhausted :) what system to install?

Generally the X is installed closer to the headers, like you have yours. Moving it back can lose the
"Sweet spot". With the look of the smoke coming off your tires, I'm not sure I would change much. :)