I think you've reasoned it very sensibly and I think I agree with all of the points you have made. At the moment I'm leaning 90% integrated 10% modular in my decision, mainly due to the pros that you mentioned.
Good luck and I hope you do well! You've got a sensible head on your shoulders and that helps
