285 tq? Is that in ft-lbs or Nm?
Good journey here. I believe a proper tune should net you much more than 5-10whp with your supporting mods. Have you considered an online tuner?
I was considering these guys here in the States when that time comes:
https://bimmerperformancecenter.com/...zhp-dme-tuning
Sent from my Pixel 2 XL using Tapatalk