I would buy the speakers first and see how well your Jolida drives them. As far as which taps to use try both to see which gives you the better sound.
If you decide to change out the amp you might want to research a Cary SLI-80. There are a couple of used units for sale on this site within your budget (no affiliation). It offers a lot of flexibility with regard to tube type and can switch from triode to ultralinear on the fly. Plus Cary offers part upgrades like capacitors and the like to improve performance. All in all a fun amp to play with and won't break the bank.
Chuck
If you decide to change out the amp you might want to research a Cary SLI-80. There are a couple of used units for sale on this site within your budget (no affiliation). It offers a lot of flexibility with regard to tube type and can switch from triode to ultralinear on the fly. Plus Cary offers part upgrades like capacitors and the like to improve performance. All in all a fun amp to play with and won't break the bank.
Chuck