It is all very confusing, but the final test is in the ride. Steeper head angles will make the bike more responsive till it gets to the point where it is dangerous, slacker angles make the bike more relaxed on steering till the point comes where there is a time lag on what you do and what the bike does.
Then you change the fork and mess it all up, so providing the bike handles the way you want it to, Don't worry.
Then you worry about rake and what differences that will make, so why be confused. Leave the bike as standard, find out whats wrong with the handling and then talk to a frame builder.
Or just ride the damn thing.