Should I do Ha Long and Sapa in my Vietnam Trip ??

My Current plan:

- Hanoi (2d, incl. Hoa Lo Prison)

- Ha Giang Loop (3–4d)

- Ninh Binh (2d – cycling + Hang Mua)

- Fly to Central → Hue (2d) + Hoi An (3d)

- Ho Chi Minh City (2–3d – War Remnants Museum + Cu Chi Tunnels)

- Sapa Maybe

Quick questions:

1. Bay (Ha Long Bay / Lan Ha Bay): Not into swimming, is it still worth doing 1 night, or should I skip entirely ?

2. Sapa in April: Worth adding for April ?

3. History: Are War Remnants + Cu Chi enough, hao prison or anything else truly worth adding ?

Thank youu