Oneplus 5 back to stock ROM and recovery

[Only_CORE]

I'm currently on LOS20 + LOS recovery, how do I go back to complete stock?
Are these the correct steps to take?

1. copy ROM (from https://service.oneplus.com/in/search/search-detail?id=2097031&articleIndex=1) to root folder.
2. flash recovery (from https://oxygenos.oneplus.net.s3.amazonaws.com/recovery.img) with fastboot.
3. boot into recovery and flash the ROM from root.
4. lock bootloader.

is this a correct order, is something missing like wipe data/cache? (between 2 and 3?)
Thanks

Edit: Tried the MSM Tool and I can't get my phone to show up there even after hours of trying different qualcomm drivers

[Only_CORE]

3 hours ago, Only_CORE said:

I'm currently on LOS20 + LOS recovery, how do I go back to complete stock?
Are these the correct steps to take?

1. copy ROM (from https://service.oneplus.com/in/search/search-detail?id=2097031&articleIndex=1) to root folder.
2. flash recovery (from https://oxygenos.oneplus.net.s3.amazonaws.com/recovery.img) with fastboot.
3. boot into recovery and flash the ROM from root.
4. lock bootloader.

is this a correct order, is something missing like wipe data/cache? (between 2 and 3?)
Thanks

Edit: Tried the MSM Tool and I can't get my phone to show up there even after hours of trying different qualcomm drivers

Solved.

For anyone wanting to do the same thing:

The reason why MSM Tool didn't work was because I was using adb reboot edl to get into EDL mode.

This doesn't work it shows as 900E in device manager! You have to press both volume buttons for 5s and then connect it to PC. It will then show up as 9008 in device manager and MSM Tool will see the device.