Proper EU Tax Handling Upsells

Please can we get proper EU tax handling for upsells. All this requires are the same Conditions functionality for Tax on Upsells that are available on main products. 

Currently the only solution I am aware of is to have 16 separate upsell blocks (one for each tax country), set that country's tax in it, and then set block visibility to only show for identified users in that country.