I ran some calculations assuming an inflation rate of 2%. At year end 2030 your mortgage balance should be $360,797.14, but inflation makes that $266,989.88 in today's dollars. I tried to replicate your Plan 1 and Plan 2, but couldn't.

Plan 1: 290k starting, 76k added in 2018 and 2019, 86k added in 2020-2025, 18k added in 2026-2030, 4% returns: $1,437,562 in 2030, subtract $266,989.88 for mortgage payoff: $1,170,572, at 4% withdrawals: $46,823

Plan 2: 290k starting, 47k added in 2018-2025, 48k added in 2026 to 2030, 4% returns: $1,174,758 in 2030, at 4% withdrawals: $46,990

You're basically in the same position either way with these assumptions.