I don't have a jetbike on hand to check if S6 or S7 is closer to the model. But yes, I'm attempting to match silhouettes to the rough volume of the models as much as possible. As for AVA, almost everything is AVA: Total at the moment. Thats the sort of adjustment you can only make over time. Along with Lieutenants and Specialists it's a gap in the list development currently.