Question on position in Stonewall

Still loving the Stonewall, but I hit a decently sharp line today where opponent jumped Ne4 pretty early then Bh4 2 moves later. I didnt want to have him play Bf2+, which would result in my trading my rook for his bishop and knight.

I know that’s a good trade, but i also know the rook is a great attacker in the Stonewall so I elected to stop him another way. Did i overestimate the rook’s value?

I got the win, but am curious if i misplayed it. Computer didnt seem to hate my path (my move ended up being #2 option) but was slightly .1 worse than #1 choice

Game below

1. d4 d5 2. e3 e6 3. Bd3 Nf6 4. f4 Nc6 5. Nf3 Be7 6. O-O Ne4 7. Ne5 Nxe5 8. fxe5 Bh4 9. Bxe4 dxe4 10. Nd2 Qg5 11. Nxe4 Qg6 12. Rf4 Bg5 13. Rg4 h5 14. Rg3 Qxe4 15. Rxg5 O-O 16. Qxh5 Qxc2 17. Bd2 Qxd2 18. Qh6 Qxe3+ 19. Kh1 g6 20. Rxg6+ fxg6 21. Qxe3 {1-0}