Just stick a 33 25 in it nowelly. Just get one that has healthy comp and obviously one that has as much stock stuff still attached as possible that doesn't look like its been just put back on. Put your sump on it and cam covers and with the money you save buy a accusump setup if you want a extra fail safe. Keep it at 7500 and love life. And from what I can see, and from what you have told me, that motor build/tune is shithouse. Woeful. Oil problems from day dot, then that. Compared to say rusty's car, which he took in, had the motor pulled, built, put back in and tuned to similar power as yours and has been drifted and daily driven for years now and the bill was about 7k or something and has yet to put a spanner to it. Edit, just saw the fuel filter thing, still, undiscovered Amazonian tribes knew you'd have oil dramas with no restrictors and a good sump etc.