Debating on solar, need help deciding, BC Canada

Hi, Got 2 quotes.

Option 1 - 24 panels - LR7-54HGBB-450M LONGi with APSystems -12 DS3-L Inverters - $30,360 (predicts yearly savings of $1,200/year, 66% energy from solar) $2.81/W

Option 2 - 30 panels - 13.5KW - Same hardware, 15 Inverters - $36,200 (Predicts yearly savings of $1,400/year, 80% energy from solar) $2.68/W

Warranties: 25 Year Panel Product Warranty, 30 Year Panel Performance Warranty, 10 Year Inverter Product Warranty

Located in Okanagan BC, so I should get $5k from Hydro, can get the 0% load for 10 years. There is a silly tree, that I can not get rid of that blocks some of the panels on the 30 panel (reduced output). I upgraded my service to 200A w/225 bus bar to max out, hence the 2 options, first was max panels distributed on roof to dodge the shade of tree, second was full roof coverage.

Debating mainly about the whole ROI, life of system etc. With the rebate, my math puts it out to about 21 years ROI for Option 1 and 22 years ROI for Option 2? Financially just doesn't make much sense, or am I missing something? I want to do solar as I feel like it helps the future/environment, but also want it to help financially of course. Always hear, by the time you pay it off you need new panels etc.

Thanks