Yep... F-35B (and a handful of F-35C) will replace all the USMC Hornets first, and then replace the AV-8B/B+.
It would be nice if the USN would buy enough F/A-18E/F/G and F-35C to be able to fully stock its carriers without borrowing USMC squadrons (and thus preventing those aircraft, bought, maintained, and flown by Marines from filling USMC tasking needs).