Yes, lacking a Peer, I think the highest ranking persons present should make the toast - it is only fitting. And I think the muddling is a result of people not knowing our past.
This type of toasting traditions is very close to what is done in Great Britain.