Nice looking bugeye, welcome! It seems that you are very well informed already. Whether or not the UP failures have been blown out of proportion, it's always good to be safe rather than sorry. The STi (or gutted stocker) uppipe will help you to pass inspection should you choose to change locations. I would remove the Fujita CAI ASAP. I had a friend that bought one of those for his 2004 WRX years ago and it caused all sorts of MAF issues.