Sounds like a good plan, unless there is something really spiffy in the 3806. When the HK 635 came out the prices dropped on 630s, so I picked up an HK630 for about 30% less than normal. Still expensive relative to US prices but I'm happy.

M60ti, VP180, QS8, M2ti, EP500, PC-Plus 20-39
M5HP, M40ti, Sierra-1
LFR1100 active, ADA1500-4 and -8