Tsmithy

Hello Everyone! I am having an issue with my Audi A5 2.0tsfi (2012) when it reaches running temperature, and I try to for instance overtake or accelerate, the EPC light comes on and tells me not to go over 4,000rpm, I imagine this is a sort of limp mode? after searching I have seen a couple of people changing out the oil switches (blue & brown) just below the oil filter. I have done this but has made no difference, I am asking if anyone can point me in the right direction? this also occasionally has the swirl flap (inlet manifold) error, this I hear is common and it comes and goes, could this be connected, as the fault reader only states this error and nothing else! Thanks for any advice!