I have a 2007 BA with short (tapered)TORs too. I just recently cut up my airbox and put in pod Uni filters. I did this in a way to allow the cheese graters to stay in place but without spenfing the $300 for the freak kit. I am also changing the exhaust. I have not finalized my jetting for the pod filters and new exhaust yet because its winter and its too darn cold to test ride right now.
However, If you want to take the easiest route which will cost the least and give you the biggest bang for your buck, I'd pull the snorkle, put in a 125 main and a TBs needle. I rode with this setup for quite a while and it works very well. If you do anything else on the intake (like drill the bottom) you may need to go up to a 45 pilot jet and in that case lose the tbs needle and put a shim under the stock needle. If you keep the stock pilot you want to turn out the mixture screw a few turns. If you go with the 45 pilot you don't need to turn it out as much.