XP-L HI on an S2 would be amazing, in a slightly longer package. Put that deep reflector to work!
(Also my suggestion can come like that straight outta the store by PMing Simon before finishing the purchase.)