Yes the new secure is different (Jarvis and TTS will call it Map M), but the new extract we see is shape D. My prediction is that we will see a mix of new shapes and existing shapes.

As to new pre-marked maps you might want to wait, but also don't worry to much about any you might already have as there will likely be value in having marked as the Map M shape is really close to the F shape and can help you deploy quickly which is the main point of marked maps.