I think there will be another couple of tier Navi's yet to be seen, one will be 2080 performance but... well when that comes.. dunno.
I agree, I expect Navi w/HBM probably next year to replace the VII. Until then, at a guess i'd say yields aren't good enough for a "big" Navi yet.