The implications of the new ETFSI-Q mass formula with Bogolyubov-enhanced shell-quenching for reproducing the solar-system r-process abundances (N r, ) are studied within the waiting-point approximation. Compared to the results obtained with the earlier ETFSI-1 masses, a considerable improvement of the global N r, fit is obtained. With this new approach, predictions are made for the r-abundances of the heaviest isotopes beyond the A 195 peak (i.e. 203 Tl to 209 Bi) and of the classical r-process cosmochronometers, which are for the first time based on an internally consistent microscopic nuclear-physics input.