Yeah,I think they're the right one's, just got to find a decent tap & die set, with those sizes in, the 15/16- 27 seem to be a bit difficult to find. I'll keep looking though.

All the best
Baz