Late model b20vtec (B8) has the same oil pump as type R. Seems like you have the list sorted.