Then explain how can O' Connor be a fed again after the events of 2F2F in what you place next, F&F?
I think 2F2F needs be disregarded as a true sequel in that way...
His and Tyrese's criminal records were pardoned. It was as if he hadn't committed any crimes and was a perfect citizen all his life.
There is no explanation of how he became a FBI agent and they'll probably never be one. He was working with the FBI in 2F2F so they probably let him join the force after helping them out. Its a small plot hole but it doesn't take away from the fact that the timeline I and the original person you quoted are right and you are wrong.