Maybe the thing to do is go straight to 300mm rotors. Those should fit inside 16s, right? I wonder if there's an affordable way to do this... I think BAT is coming out with a kit for this, but as far as I can tell in their catalogue so far, it's only with expensive four-piston calipers.