Hi, all! My future fiancé and I have already purchased the setting for my engagement ring. Were still in the process of sourcing a diamond because the ones offered at our jeweler were way overpriced for the quality. Over the last few days, I've been talking to a well reputed jeweler in NYC's diamond district that has a stone that I'm interested in. They've offered to custom make the exact same setting for the same price, but with a few differences that would most likely make the setting nicer. Were still in the return period for the first setting, so thats not an issue, but I cant decide what to do! Ill list the pros & cons of both below and include pictures of my current setting (sorry there's so many!). Opinions needed

Option A (the current setting):
-we already have the setting in hand
-its from a jeweler nearby who would be able to service and clean it free of charge (no mailing it in unless we moved away from the area, though that is a possibility)
- free resizing for life
-free lifetime warranty, including normal usage side stone replacement (well have it insured either wayoption B only includes side stone replacement if theres a structural defect )
-slightly lower quality of work (I thinkadmittedly I dont know that much about setting design)
- potential for gaps between stone and halo once set
-we paid sales tax and would have to pay a fee to have the outside stone set ($450ish total)
Option B (the custom setting):
-Higher quality side stones (G, VS2 vs. SI1 or better in clarity and G-H or better in color)
-more delicate micro pave (less metal would show)
- eagle claw prongs
- halo sized to fit the stone precisely (of course that means if we upgraded the stone down the road, we'd have to either have it reworked or purchase a new setting, but we might have to do that anyway because my current setting will only hold up to a 1.14 carat)
-no sales tax or fee to have the stone set ($450ish value)
--we could have the material upgraded from 14k white gold to platinum for a reasonable upcharge
-warranty only covers structural defect-- the jeweler would determine if damage met this criteria
-free cleanings, but ring has to be mailed to their office
-no free sizing after 60 days
-wed have to wait for this to be custom designed and mailed to us (not the biggest deal, but still a factor)
So, what would you do? Thanks for the help!

Option A (the current setting):
-we already have the setting in hand
-its from a jeweler nearby who would be able to service and clean it free of charge (no mailing it in unless we moved away from the area, though that is a possibility)
- free resizing for life
-free lifetime warranty, including normal usage side stone replacement (well have it insured either wayoption B only includes side stone replacement if theres a structural defect )
-slightly lower quality of work (I thinkadmittedly I dont know that much about setting design)
- potential for gaps between stone and halo once set
-we paid sales tax and would have to pay a fee to have the outside stone set ($450ish total)
Option B (the custom setting):
-Higher quality side stones (G, VS2 vs. SI1 or better in clarity and G-H or better in color)
-more delicate micro pave (less metal would show)
- eagle claw prongs
- halo sized to fit the stone precisely (of course that means if we upgraded the stone down the road, we'd have to either have it reworked or purchase a new setting, but we might have to do that anyway because my current setting will only hold up to a 1.14 carat)
-no sales tax or fee to have the stone set ($450ish value)
--we could have the material upgraded from 14k white gold to platinum for a reasonable upcharge
-warranty only covers structural defect-- the jeweler would determine if damage met this criteria
-free cleanings, but ring has to be mailed to their office
-no free sizing after 60 days
-wed have to wait for this to be custom designed and mailed to us (not the biggest deal, but still a factor)
So, what would you do? Thanks for the help!