2010 Si Coupe - Tune Help

[Saintly]

Good day!

I've recently swapped engines in my 2010 Si because of an unfortunate hydrolocking incident. Since I had the engine out I did the timing, changed seals (main seals, vtc, egr), and added:

-K-Tuned headers w/ straightpipe
-Invidia Q35 catback
-DC Sports SRI (CAI is what killed my last engine and I'm still having PTSD over it LOL)
-P2R throttle body spacer
-K-Tuned knock sensor

I was wondering if anyone can help me with a tune.. Willing to tip since this is my daily and I'm already in so much trouble with the wife over this project. I ran a basemap for Skunk2 header, catback, and CAI. Seemed to be the closest option I could see. I have 3 datalogs attached.

Some context:
Datalog0000 is from last night, and I had thrown a code earlier that day while I wasn't datalogging.
Datalog0001 is recent from today. I had cleared the code and it ran alright and I stopped for 91 gas. I have access to 93, should I be using that instead? I currently get ~26 mpg off 91
Datalog0002 is recent from today. This is after I got gas. After I got onto the highway it threw a code.

I have an OEM knock sensor on order now to rule out the knock code. However, the P2R throttle body spacer was griefing me prior to the basemap throwing lean mix codes - so I think that could be the culprit. I seem to always get codes when I'm trailing behind a person who isn't going the speed limit and my car doesn't appreciate that lol.

Let me know if I left out any info!

Cheers!

Saintly