Yes, the latest in the media is that one of them will be redisgned to accept the USN version of the JSF; so, the cost is really taking off now.
Both CVFs will be fitted for the F-35C. QE will be built in STOVL config, and PoW will be built as CATOBAR. Following PoW's Commissioning, QE will go back into refit and get converted to CATOBAR mode. This was covered
here, when the defense review came out.