Well, my opinion is worth what you pay for it and I totally respect that you're free to do whatever you like with your money so don't take the following in a negative way because it's not intended so:
I.m.o. what you're trying to do is to turn a donkey into a race horse by investing in extra training, feeding it class A vegetables in stead of hay, putting platinum horse shoes on it and coating it in teflon spray to reduce the drag coefficient. All very nice tweaks. But the fact of the matter is that it remains a donkey, not an arab stallion. Only, by the time you're done you'll have sunk so much into it that you could have purchased a zero frills arab in the first place.
Long story but professionally I see this all the time. It's the type of thing that typically makes any infrastructure project cost 2.1 times the initial budget. Safe to say that I'm not an incrementalist I guess.