Had 2 x Cat6, but given the uncertainty about how they map have just upgraded one to a Cat7. There are lots of places I like at the 35k rate.
Hopefully the Cat6 will map to the same Cat in the new program, but even if it doesn't I will still be able to make use of that, so basically just trading in a bit of potential upside for some certainty