I'd go with the FIPK. Get some extra ponies. I would only buy the shifter now if you're having trouble with the stocker. Some (minority it seems) actually prefer their stock shifter.
K & N - I want the power first.. I went with SFPHQ S & B filter - it has an open end so when you take the headlight out at the track - it's true ram-air..