Hey mate,
Sounds like you will have it sorted soon. Also had a few issues with mine with the same codes but it was very hard to cold start.
Sorted plenty of small things out along the way but the 2 big ones affecting me were spun balancer and a faulty
MAF.