#18 still wins. #18 is comparable to weighted Kamiccolo who is far beyond Vegeta, and even the future #18 (who's weaker than the present one) was able to fire off a blast she thought would kill pre-Rosat Future Trunks with ease, and Future Trunks isn't far below Vegeta.
For reasons Kenshi stated, #18 still stomps. Stamina was brought up as an issue for Vegeta, but not the main one considering #17 and #18's strength is what the Z-Warriors went on about after their defeat. SSJ Trunks, who's barely behind Goku and Vegeta, was also near enough oneshotted by #18 despite not having done enough to decrease his maximum Ki output.