Scottish/Irish/surname baby name

[babyneedsname]

Me and my husband cannot agree on names. He is very keen to have a Scottish name if it's a boy, but would also settle for Irish (we are both).

I've also narrowed down that he likes surnames as first names too (things like Jaxson). These don't have to be celtic.

Names we've considered and like but have discounted - mainly due to other family members using first:
Charlie
Brodie
Cameron
Arran
Harris

Can anyone help me find a name we both love?

Rory or irish spelling Raurhi
Cian or Ciaran
Cameron
Finnbar or Finn
Eamon
Kevin

Fraser
Keir
Oran

I have a Cameron and these are the other names I considered.

Scottish/Irish:
Gregory
Mackenzie
Macaulay
Grant
Kenzie
Bruce
Gregor
Ross
Eamon
Kieran

Surnames:
Morgan
Wilson
Marshall
Hudson
Tyler

Random:
Conrad
Vaughn
Byron
Heath
Josiah
Jacobi

Brogan
Logan
Ross
Stuart
Cooper
James
Murdo
Blair

Callan
Alban
Euan
Fergus
Lachlan

Archie
Broadie
Callum
Andrew

Fraser
Kerr
Keir

Breifne
Lachlan
Tarlach

Macdara
Cuan
Conall
Setanta
Barra
Fionn
Malachi
Ultan

Malachy with a y rather than i, it autocorrected me.

How about Ethan?
Good appeal across celtic nations, nice meaning and difficult to shorten.

Barron
Macadam
Menzies
Douglas
Duncan
Robert
Andrew
Donovan
Solomon
Blair
Craig
Donal
Eunan
Finlay
Glen
Grant
Maxwell
Mac
Zenon

Me and my partner had the same issue, in the end we named our eldest Arran and our youngest Fraser.
We considered
Lewis
Harris
Finlay
Andrew
Callum