hit up motorcepts in richmond hill.
johnson ho is a great guy
http://www.motorcepts.com/
or MNC in Oceanside
martin is a former BMW tech
https://www.facebook.com/mncperformance
or Petrolwerks in lyndenhurst
Moe does great work
http://www.petrolwerks.com/
which ever is closest to you