Can't Decide On A Laptop

Total budget and country of purchase: $1000-$2000 CAD

Do you prefer a 2 in 1 form factor, good battery life or best specifications to your requirements for the money? Pick or include any that apply. Battery life needs to be decent, at least 5-6 hours just browsing the web and taking notes.

How important is weight to you? Don't want it to be too heavy as I would be carrying it around throughout the day

Which OS do you require? Windows, Linux, Mac. Windows or Mac

Do you have a preferred screen size? If indifferent, put N/A. 13" or 15" at least 1080p

Are you doing any CAD/video editing/photo editing/gaming? List which programs/games you desire to run. If you have no requirements, put N/A. Might need to use CAD later on as I am in engineering. I would also like to be able to do a bit of gaming for when I am not at home.

If you're gaming (leave blank if you put N/A above...), do you have certain games you want to play? At what settings and FPS do you want? Most modern titles at playable FPS is good, but I am fine with other options.

Any specific requirements such as good keyboard, reliable business grade build quality, touch-screen, finger-print reader, optical drive or good input devices (keyboard/touchpad)? I would like the quality to be pretty good, optical drive is not needed. A touchscreen would be nice but is not a necessity.

Leave any finishing thoughts here that you may feel are necessary and beneficial to the discussion. Currently I am looking at the XPS 15, but a lot of the reviews are making me cautious in buying it. I am also open to the idea of a Macbook Pro but would wait until the new ones are announced. Any other recommendations are welcome.