Sounds like you have a good budget and have been riding awhile. For your wants, I'd suggest: NS Infinity as you mentioned, but also the Gnu B-Pro and Roxy Eminence.
18 Snoplanks Asym Fish . 16 NS Swift - 14 TJ Brand Retro Fish
17 Burton Malavita Wing . 16 Burton Genesis X
16 Flow Talon